Changeset 5cb41d1b3661f82c7315a810af6e7b54298dafd6

Timestamp:

11/24/09 03:10:57 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

4d061b7a395988015d68223c9fc0f17d9089dad7

Parents:

e5b356ebda47eb1f7bd963d5b216c953e807d406

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-11-24T03:10:57Z+0200

Message:

switch from event queue to environment state; run the studio cqueue

Location:

daemon

Files:

• studio.c (modified) (16 diffs)
• studio_internal.h (modified) (4 diffs)
• studio_load.c (modified) (5 diffs)

daemon/studio.c

@@ -46 +46 @@
 struct studio g_studio;
 
-#define EVENT_JACK_START   0
-#define EVENT_JACK_STOP    1
-
-struct event
-{
-  struct list_head siblings;
-  unsigned int type;
-};
-
 bool studio_name_generate(char ** name_ptr)
 {
@@ -124 +115 @@
 bool studio_start(void)
 {
-  if (g_studio.jack_pending)
-  {
-    log_error("JACK is not in stable state");
-    return false;
-  }
-
-  if (!g_studio.jack_running)
-  {
-    log_info("Starting JACK server.");
-
-    g_studio.jack_pending = true;
-    if (!jack_proxy_start_server())
-    {
-      log_error("jack_proxy_start_server() failed.");
-      return false;
-    }
-  }
-
-  return true;
-}
-
-static bool studio_stop(bool clear, bool * clear_defered_ptr)
-{
-  if (g_studio.jack_pending)
-  {
-    log_error("JACK is not in stable state");
-    return false;
-  }
-
-  if (g_studio.jack_running)
-  {
-    log_info("Stopping JACK server...");
-
-    g_studio.automatic = false;   /* even if it was automatic, it is not anymore because user knows about it */
-
-    g_studio.jack_pending = true;
-
-    if (clear)
-    {
-      log_info("defer studio clear until jack stops");
-      g_studio.clear_on_jack_stop = true;
-      *clear_defered_ptr = true;
-    }
-
-    if (!jack_proxy_stop_server())
-    {
-      log_error("Stopping JACK server failed.");
-      g_studio.jack_pending = false;
-      return false;
-    }
-  }
-  else if (clear)
-  {
-    *clear_defered_ptr = false;
-  }
-
-  return true;
-}
-
-bool studio_clear(bool defer_if_started)
-{
-  bool clear_defered;
-
+  if (ladish_environment_get(&g_studio.env_store, ladish_environment_jack_server_started))
+  {
+    log_info("JACK server is already started");
+    return true;
+  }
+
+  log_info("Starting JACK server.");
+
+  if (!jack_proxy_start_server())
+  {
+    log_error("jack_proxy_start_server() failed.");
+    return false;
+  }
+
+  return true;
+}
+
+static bool studio_stop(void)
+{
+  if (!ladish_environment_get(&g_studio.env_store, ladish_environment_jack_server_started))
+  {
+    log_info("JACK server is already stopped");
+    return true;
+  }
+
+  log_info("Stopping JACK server...");
+
+  g_studio.automatic = false;   /* even if it was automatic, it is not anymore because user knows about it */
+
+  if (!jack_proxy_stop_server())
+  {
+    log_error("Stopping JACK server failed.");
+    return false;
+  }
+
+  return true;
+}
+
+bool studio_clear(void)
+{
   log_info("studio_clear() called.");
 
-  if (!studio_stop(defer_if_started, &clear_defered))
-  {
-    return false;
-  }
-
-  if (defer_if_started && clear_defered)
-  {
-    return true;
+  if (!studio_stop())
+  {
+    return false;
   }
 
@@ -238 +201 @@
   {
     log_info("Unloading automatic studio.");
-    studio_clear(true);
+    studio_clear();
     return;
   }
@@ -245 +208 @@
 void on_event_jack_started(void)
 {
-  g_studio.jack_pending = false;
-  g_studio.jack_running = true;
-
   if (g_studio.dbus_object == NULL)
   {
@@ -296 +256 @@
 {
   emit_studio_stopped();
-  g_studio.jack_pending = false;
-  g_studio.jack_running = false;
-
-  if (g_studio.clear_on_jack_stop)
-  {
-    g_studio.clear_on_jack_stop = false;
-    studio_clear(false);
-  }
-  else
-  {
-    studio_clear_if_automatic();
-  }
+  studio_clear_if_automatic();
 
   if (g_studio.jack_dispatcher)
@@ -326 +275 @@
 void studio_run(void)
 {
-  struct event * event_ptr;
-
-  while (!list_empty(&g_studio.event_queue))
-  {
-    event_ptr = list_entry(g_studio.event_queue.next, struct event, siblings);
-    list_del(g_studio.event_queue.next);
-
-    switch (event_ptr->type)
-    {
-    case EVENT_JACK_START:
+  bool state;
+
+  ladish_cqueue_run(&g_studio.cmd_queue);
+
+  if (ladish_environment_consume_change(&g_studio.env_store, ladish_environment_jack_server_started, &state))
+  {
+    if (state)
+    {
       on_event_jack_started();
-      break;
-    case EVENT_JACK_STOP:
+    }
+    else
+    {
       on_event_jack_stopped();
-      break;
-    }
-
-    free(event_ptr);
-  }
+    }
+  }
+
+  ladish_environment_ignore(&g_studio.env_store, ladish_environment_jack_server_present);
+  ladish_environment_assert_consumed(&g_studio.env_store);
 }
 
 static void on_jack_server_started(void)
 {
-  struct event * event_ptr;
-
   log_info("JACK server start detected.");
-
-  event_ptr = malloc(sizeof(struct event));
-  if (event_ptr == NULL)
-  {
-    log_error("malloc() failed to allocate struct event. Ignoring JACK start.");
-    return;
-  }
-
-  event_ptr->type = EVENT_JACK_START;
-  list_add_tail(&event_ptr->siblings, &g_studio.event_queue);
+  ladish_environment_set(&g_studio.env_store, ladish_environment_jack_server_started);
 }
 
 static void on_jack_server_stopped(void)
 {
-  struct event * event_ptr;
-
-  log_info("JACK server stop detected.");
-
-  event_ptr = malloc(sizeof(struct event));
-  if (event_ptr == NULL)
-  {
-    log_error("malloc() failed to allocate struct event. Ignoring JACK stop.");
-    return;
-  }
-
-  event_ptr->type = EVENT_JACK_STOP;
-  list_add_tail(&event_ptr->siblings, &g_studio.event_queue);
+  ladish_environment_reset(&g_studio.env_store, ladish_environment_jack_server_started);
 }
 
@@ -384 +309 @@
 {
   log_info("JACK controller appeared.");
+  ladish_environment_set(&g_studio.env_store, ladish_environment_jack_server_present);
 }
 
@@ -389 +315 @@
 {
   log_info("JACK controller disappeared.");
+  ladish_environment_reset(&g_studio.env_store, ladish_environment_jack_server_present);
 }
 
@@ -420 +347 @@
   INIT_LIST_HEAD(&g_studio.jack_params);
 
-  INIT_LIST_HEAD(&g_studio.event_queue);
-
   g_studio.dbus_object = NULL;
   g_studio.name = NULL;
   g_studio.filename = NULL;
-  g_studio.jack_running = false;
-  g_studio.jack_pending = false;
 
   if (!ladish_graph_create(&g_studio.jack_graph, NULL))
@@ -441 +364 @@
 
   ladish_cqueue_init(&g_studio.cmd_queue);
+  ladish_environment_init(&g_studio.env_store);
 
   if (!jack_proxy_init(
@@ -459 +383 @@
   ladish_graph_destroy(g_studio.jack_graph, false);
 free_studios_dir:
-  studio_clear(false);
+  studio_clear();
   free(g_studios_dir);
 fail:
@@ -471 +395 @@
   jack_proxy_uninit();
 
-  studio_clear(false);
+  studio_clear();
 
   ladish_cqueue_uninit(&g_studio.cmd_queue);
@@ -685 +609 @@
 {
   log_info("Unload studio request");
-  studio_clear(true);
+  studio_clear();
   method_return_new_void(call_ptr);
 }
@@ -692 +616 @@
 {
   log_info("New studio request (%s)", studio_name);
-  if (!studio_clear(false))
+  if (!studio_clear())
   {
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Cannot create new studio when other studio is running.");
@@ -717 +641 @@
   {
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "studio_publish() failed.");
-    studio_clear(false);
+    studio_clear();
     return false;
   }
@@ -728 +652 @@
   log_info("Studio stop requested");
 
-  if (!studio_stop(false, NULL))
+  if (!studio_stop())
   {
       lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Failed to stop studio.");

daemon/studio_internal.h

@@ -36 +36 @@
 #define JACK_CONF_MAX_ADDRESS_SIZE 1024
 
+typedef int ladish_environment_id;
+
+typedef struct
+{
+  uint64_t state;
+  uint64_t changed;
+} ladish_environment_store;
+
+#define ladish_environment_jack_server_present    ((ladish_environment_id)0)
+#define ladish_environment_jack_server_started    ((ladish_environment_id)1)
+
+static inline void ladish_environment_init(ladish_environment_store * store_ptr)
+{
+  store_ptr->state = 0;
+  store_ptr->changed = 0;
+}
+
+static inline uint64_t ladish_environment_state(ladish_environment_id id)
+{
+  ASSERT(sizeof(id) < 8);
+  return (uint64_t)1 << id;
+}
+
+static inline void ladish_environment_set(ladish_environment_store * store_ptr, ladish_environment_id id)
+{
+  uint64_t state = ladish_environment_state(id);
+  store_ptr->state |= state;
+  store_ptr->changed |= state;
+}
+
+static inline void ladish_environment_reset(ladish_environment_store * store_ptr, ladish_environment_id id)
+{
+  uint64_t state = ladish_environment_state(id);
+  store_ptr->state &= ~state;
+  store_ptr->changed |= state;
+}
+
+static inline bool ladish_environment_get(ladish_environment_store * store_ptr, ladish_environment_id id)
+{
+  uint64_t state = ladish_environment_state(id);
+
+  return (store_ptr->state & state) == state;
+}
+
+static inline bool ladish_environment_consume_change(ladish_environment_store * store_ptr, ladish_environment_id id, bool * new_state)
+{
+  uint64_t state = ladish_environment_state(id);
+
+  if ((store_ptr->changed & state) == 0)
+  {
+    return false;
+  }
+
+  *new_state = (store_ptr->state & state) == state;
+  store_ptr->changed &= ~state;
+  return true;
+}
+
+static inline void ladish_environment_ignore(ladish_environment_store * store_ptr, ladish_environment_id id)
+{
+  uint64_t state = ladish_environment_state(id);
+
+  if ((store_ptr->changed & state) != 0)
+  {
+    store_ptr->changed &= ~state;
+  }
+}
+
+#define ladish_environment_assert_consumed(store_ptr) ASSERT((store_ptr)->changed == 0)
+
 struct studio
 {
@@ -52 +122 @@
   bool modified:1;              /* Studio needs saving */
   bool jack_conf_valid:1;       /* JACK server configuration obtained successfully */
-  bool jack_running:1;          /* JACK server is running */
-  bool jack_pending:1;          /* JACK server start/stop is pending */
-  bool clear_on_jack_stop:1;    /* clear studio when JACK is stopped */
 
   struct list_head jack_conf;   /* root of the conf tree */
@@ -62 +129 @@
 
   struct ladish_cqueue cmd_queue;
-  struct list_head event_queue;
+  ladish_environment_store env_store;
 
   char * name;
@@ -106 +173 @@
 bool studio_fetch_jack_settings(void);
 bool studio_compose_filename(const char * name, char ** filename_ptr_ptr, char ** backup_filename_ptr_ptr);
-bool studio_clear(bool defer_if_started);
+bool studio_clear(void);
 bool studio_publish(void);
 bool studio_start(void);

daemon/studio_load.c

@@ -667 +667 @@
   }
 
-  studio_clear(false);
+  studio_clear();
 
   g_studio.name = strdup(studio_name);
@@ -743 +743 @@
     XML_ParserFree(parser);
     close(fd);
-    studio_clear(false);
+    studio_clear();
     return false;
   }
@@ -753 +753 @@
   {
     /* if we have initiated the fail, dbus error is already set to better message */
-    studio_clear(false);
+    studio_clear();
     return false;
   }
@@ -766 +766 @@
   {
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "studio_publish() failed.");
-    studio_clear(false);
+    studio_clear();
     return false;
   }
@@ -773 +773 @@
   {
       lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Failed to start JACK server.");
-      studio_clear(false);
+      studio_clear();
       return false;
   }