Changeset 09ef9023bca7d8c58c93e3e13e8cd9ad6b110c4b

Timestamp:

03/06/10 01:35:47 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

fc21df8068e684f6a73263e74d440c9ba045ffb0

Parents:

945b3aa6865654fd54707c298636a428c6510755

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-06T01:35:47Z+0200

Message:

daemon: implement timeout when waiting for jack server started signal

Files:

• daemon/cmd_start_studio.c (modified) (9 diffs)

daemon/cmd_start_studio.c

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -25 +25 @@
  */
 
+#include <unistd.h>
+
 #include "cmd.h"
 #include "studio_internal.h"
 #include "loader.h"
 
-#define cmd_ptr ((struct ladish_command *)context)
+struct ladish_command_start_studio
+{
+  struct ladish_command command;
+  uint64_t deadline;
+};
+
+static uint64_t get_current_microseconds(void)
+{
+  struct timeval time;
+
+  if (gettimeofday(&time, NULL) != 0)
+    return 0;
+
+  return (uint64_t)time.tv_sec * 1000000 + (uint64_t)time.tv_usec;
+}
+
+#define cmd_ptr ((struct ladish_command_start_studio *)context)
 
 static bool run(void * context)
@@ -36 +54 @@
   unsigned int app_count;
 
-  switch (cmd_ptr->state)
+  switch (cmd_ptr->command.state)
   {
   case LADISH_COMMAND_STATE_PENDING:
@@ -43 +61 @@
       log_info("Ignoring start request because studio is already started.");
       /* nothing to do, studio is already running */
-      cmd_ptr->state = LADISH_COMMAND_STATE_DONE;
+      cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
       return true;
     }
@@ -66 +84 @@
     }
 
-    cmd_ptr->state = LADISH_COMMAND_STATE_WAITING;
+    cmd_ptr->deadline = get_current_microseconds();
+    if (cmd_ptr->deadline != 0)
+    {
+      cmd_ptr->deadline += 5000000;
+    }
+
+    cmd_ptr->command.state = LADISH_COMMAND_STATE_WAITING;
     /* fall through */
   case LADISH_COMMAND_STATE_WAITING:
@@ -73 +97 @@
       /* we are still waiting for the JACK server start */
       ASSERT(!ladish_environment_get(&g_studio.env_store, ladish_environment_jack_server_started)); /* someone else consumed the state change? */
+
+      if (cmd_ptr->deadline != 0 && get_current_microseconds() >= cmd_ptr->deadline)
+      {
+        log_error("Starting JACK server succeded, but 'started' signal was not received within 5 seconds.");
+        cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
+        return false;
+      }
+
       return true;
     }
@@ -82 +114 @@
     on_event_jack_started();    /* fetch configuration and announce start */
 
-    cmd_ptr->state = LADISH_COMMAND_STATE_DONE;
+    cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
     return true;
   }
@@ -94 +126 @@
 bool ladish_command_start_studio(void * call_ptr, struct ladish_cqueue * queue_ptr)
 {
-  struct ladish_command * cmd_ptr;
+  struct ladish_command_start_studio * cmd_ptr;
 
-  cmd_ptr = ladish_command_new(sizeof(struct ladish_command));
+  cmd_ptr = ladish_command_new(sizeof(struct ladish_command_start_studio));
   if (cmd_ptr == NULL)
   {
@@ -103 +135 @@
   }
 
-  cmd_ptr->run = run;
+  cmd_ptr->command.run = run;
+  cmd_ptr->deadline = 0;
 
-  if (!ladish_cqueue_add_command(queue_ptr, cmd_ptr))
+  if (!ladish_cqueue_add_command(queue_ptr, &cmd_ptr->command))
   {
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "ladish_cqueue_add_command() failed.");