Changeset fc21df8068e684f6a73263e74d440c9ba045ffb0

Timestamp:

03/06/10 02:17:51 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

eee9239f0ce95575624ed911defebd628a458891

Parents:

09ef9023bca7d8c58c93e3e13e8cd9ad6b110c4b

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-06T02:17:51Z+0200

Message:

daemon: better implementation of server stop timeout workaround

• current time check is more precise
• waits during command executions are suboptimal because they block the main loop

Files:

• common/time.c (added)
• common/time.h (added)
• daemon/cmd_start_studio.c (modified) (4 diffs)
• daemon/cmd_stop_studio.c (modified) (7 diffs)
• wscript (modified) (1 diff)

daemon/cmd_start_studio.c

@@ -30 +30 @@
 #include "studio_internal.h"
 #include "loader.h"
+#include "../common/time.h"
 
 struct ladish_command_start_studio
@@ -36 +37 @@
   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)
@@ -84 +75 @@
     }
 
-    cmd_ptr->deadline = get_current_microseconds();
+    cmd_ptr->deadline = ladish_get_current_microseconds();
     if (cmd_ptr->deadline != 0)
     {
@@ -98 +89 @@
       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)
+      if (cmd_ptr->deadline != 0 && ladish_get_current_microseconds() >= cmd_ptr->deadline)
       {
         log_error("Starting JACK server succeded, but 'started' signal was not received within 5 seconds.");

daemon/cmd_stop_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>
  *
  **************************************************************************
@@ -30 +30 @@
 #include "studio_internal.h"
 #include "loader.h"
+#include "../common/time.h"
 
 #define STOP_STATE_WAITING_FOR_JACK_CLIENTS_DISAPPEAR   1
@@ -38 +39 @@
 {
   struct ladish_command command;
-  int stop_waits;
+  uint64_t deadline;
   unsigned int stop_state;
 };
@@ -103 +104 @@
         /* Reproducable with yoshimi-0.0.45 */
 
-        cmd_ptr->stop_waits = 5000;
+        cmd_ptr->deadline = ladish_get_current_microseconds();
+        if (cmd_ptr->deadline != 0)
+        {
+          cmd_ptr->deadline += 5000000;
+        }
+
         return true;
       }
@@ -110 +116 @@
     ASSERT(cmd_ptr->stop_state == STOP_STATE_WAITING_FOR_JACK_SERVER_STOP);
 
-    if (cmd_ptr->stop_waits > 0)
+    if (cmd_ptr->deadline != 0)
     {
-      if (!jack_proxy_is_started(&jack_server_started))
-      {
-        log_error("jack_proxy_is_started() failed.");
-        return false;
-      }
-
-      if (!jack_server_started)
+      if (jack_proxy_is_started(&jack_server_started) && !jack_server_started)
       {
         ladish_environment_reset_stealth(&g_studio.env_store, ladish_environment_jack_server_started);
@@ -124 +124 @@
       }
 
-      if (cmd_ptr->stop_waits == 1)
+      if (ladish_get_current_microseconds() >= cmd_ptr->deadline)
       {
-        log_error("JACK server stop wait after stop request expired.");
+        log_error("JACK server stop wait after stop request expired (5 seconds).");
+        cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
         return false;
       }
 
-      cmd_ptr->stop_waits--;
-      usleep(1000);
       return true;
     }
@@ -175 +174 @@
 
   cmd_ptr->command.run = run;
-  cmd_ptr->stop_waits = -1;
+  cmd_ptr->deadline = 0;
 
   if (!ladish_cqueue_add_command(queue_ptr, &cmd_ptr->command))

wscript

@@ -247 +247 @@
         daemon.source.append(os.path.join("dbus", source))
 
-    daemon.source.append(os.path.join("common", "safety.c"))
+    for source in [
+        'safety.c',
+        'time.c',
+        ]:
+        daemon.source.append(os.path.join("common", source))
 
     # process name.arnaudov.nedko.ladish.service.in -> name.arnaudov.nedko.ladish.service