From abbc27d2b1460a10d7168114f2252313b98e4a08 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Wed, 28 Jul 2010 01:57:44 +0000 Subject: cli: Init conditional mutex at the right place Signed-off-by: Vijay Bellur Signed-off-by: Anand V. Avati BUG: 1205 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1205 --- cli/src/cli-cmd.c | 3 +-- cli/src/cli.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'cli') diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index ee30ea996e6..b4967d2cca6 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -248,10 +248,9 @@ cli_cmd_await_connected () int32_t cli_cmd_broadcast_connected () { - connected = 1; - gf_log ("", GF_LOG_NORMAL, "Connected"); pthread_mutex_lock (&conn_mutex); { + connected = 1; pthread_cond_broadcast (&conn); } diff --git a/cli/src/cli.c b/cli/src/cli.c index 59782b42db2..31305b05dc7 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -519,12 +519,11 @@ main (int argc, char *argv[]) if (ret) goto out; - - ret = cli_input_init (&state); + ret = cli_cmd_cond_init (); if (ret) goto out; - ret = cli_cmd_cond_init (); + ret = cli_input_init (&state); if (ret) goto out; -- cgit