Changeset f42b4fbef76944dc292983208ef62e144ab7031f

Timestamp:

10/02/11 00:47:50 (20 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

36ef11202b7e4345f2402d8ea9cf6395ac857081

Parents:

5483a52daf9dca6aa6cbfafc7d6d050456d49dd3

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-02T00:47:50Z+0300

Message:

operational jack session implementation

Files:

• common/dirhelpers.c (modified) (3 diffs)
• common/dirhelpers.h (modified) (1 diff)
• daemon/app_supervisor.c (modified) (21 diffs)
• daemon/app_supervisor.h (modified) (2 diffs)
• daemon/loader.c (modified) (4 diffs)
• daemon/loader.h (modified) (2 diffs)
• daemon/room_load.c (modified) (2 diffs)
• gui/dialogs.c (modified) (1 diff)
• gui/gladish.ui (modified) (1 diff)
• gui/world_tree.c (modified) (1 diff)

common/dirhelpers.c

@@ -26 +26 @@
 
 #include "../common.h"
+#include "catdup.h"
 
 #include <sys/types.h>
@@ -32 +33 @@
 #include <errno.h>
 #include <stdarg.h>
+#include <dirent.h>
 
 bool check_dir_exists(const char * dirname)
@@ -241 +243 @@
   return ret;
 }
+
+bool ladish_rmdir_recursive(const char * dirpath)
+{
+  DIR * dir;
+  struct dirent * dentry_ptr;
+  char * entry_fullpath;
+  struct stat st;
+  bool success;
+
+  success = false;
+
+  dir = opendir(dirpath);
+  if (dir == NULL)
+  {
+    log_error("Cannot open directory '%s': %d (%s)", dirpath, errno, strerror(errno));
+    goto exit;
+  }
+
+  while ((dentry_ptr = readdir(dir)) != NULL)
+  {
+    if (strcmp(dentry_ptr->d_name, ".") == 0 ||
+        strcmp(dentry_ptr->d_name, "..") == 0)
+    {
+      continue;
+    }
+
+    entry_fullpath = catdup3(dirpath, "/", dentry_ptr->d_name);
+    if (entry_fullpath == NULL)
+    {
+      log_error("catdup() failed");
+      goto close;
+    }
+
+    if (stat(entry_fullpath, &st) != 0)
+    {
+      log_error("failed to stat '%s': %d (%s)", entry_fullpath, errno, strerror(errno));
+    }
+    else
+    {
+      if (S_ISDIR(st.st_mode))
+      {
+        if (!ladish_rmdir_recursive(entry_fullpath))
+        {
+          goto free;
+        }
+      }
+      else
+      {
+        if (unlink(entry_fullpath) < 0)
+        {
+          log_error("unlink('%s') failed. errno = %d (%s)", dirpath, errno, strerror(errno));
+          goto free;
+        }
+      }
+    }
+
+    free(entry_fullpath);
+  }
+
+  if (rmdir(dirpath) < 0)
+  {
+    log_error("rmdir('%s') failed. errno = %d (%s)", dirpath, errno, strerror(errno));
+  }
+  else
+  {
+    success = true;
+  }
+
+  goto close;
+
+free:
+  free(entry_fullpath);
+close:
+  closedir(dir);
+exit:
+  return success;
+}
+
+bool ladish_rotate(const char * src, const char * dst, unsigned int max_backups)
+{
+  size_t len = strlen(dst) + 100;
+  char paths[2][len];
+  struct stat st;
+  char * path;
+  const char * older_path;
+  bool oldest_found;
+  unsigned int backup;
+
+  oldest_found = false;
+  older_path = NULL;
+  backup = max_backups;
+  while (backup > 0)
+  {
+    path = paths[backup % 2];
+    snprintf(path, len, "%s.%u", dst, backup);
+
+    if (stat(path, &st) != 0)
+    {
+      if (!oldest_found && errno == ENOENT)
+      {
+        log_info("\"%s\" does not exist", path);
+        goto next;
+      }
+
+      log_error("Failed to stat \"%s\": %d (%s)", path, errno, strerror(errno));
+      return false;
+    }
+
+    if (!S_ISDIR(st.st_mode))
+    {
+      log_error("\"%s\" exists but is not directory.", path);
+      return false;
+    }
+
+    oldest_found = true;
+
+    if (backup < max_backups)
+    {
+      ASSERT(older_path != NULL);
+      log_info("rename '%s' -> '%s'", path, older_path);
+      if (rename(path, older_path) != 0)
+      {
+        log_error("rename('%s' -> '%s') failed. errno = %d (%s)", path, older_path, errno, strerror(errno));
+        return false;
+      }
+    }
+    else
+    {
+      /* try to remove dst.max_backups */
+      log_info("rmdir '%s'", path);
+      if (!ladish_rmdir_recursive(path))
+      {
+        return false;
+      }
+    }
+
+  next:
+    older_path = path;
+    backup--;
+  }
+
+  log_info("rename '%s' -> '%s'", dst, path);
+  if (rename(dst, path) != 0 && errno != ENOENT)
+  {
+    log_error("rename('%s' -> '%s') failed. errno = %d (%s)", dst, path, errno, strerror(errno));
+    return false;
+  }
+
+  log_info("rename '%s' -> '%s'", src, dst);
+  if (rename(src, dst) != 0)
+  {
+    log_error("rename('%s' -> '%s') failed. errno = %d (%s)", src, dst, errno, strerror(errno));
+    return false;
+  }
+
+  return true;
+}

common/dirhelpers.h

@@ -31 +31 @@
 bool ensure_dir_exist(const char * dirname, int mode);
 bool ensure_dir_exist_varg(int mode, ...);
+bool ladish_rmdir_recursive(const char * dirname);
+bool ladish_rotate(const char * src, const char * dst, unsigned int max_backups);
 
 #endif /* #ifndef DIRHELPERS_H__805193D2_2662_40FA_8814_AF8A4E08F4B0__INCLUDED */

daemon/app_supervisor.c

@@ -41 +41 @@
 #include "../common/catdup.h"
 #include "../common/dirhelpers.h"
+#include "jack_session.h"
 
 struct ladish_app
@@ -49 +50 @@
   char * name;
   char * commandline;
+  char * js_commandline;
   bool terminal;
   char level[MAX_LEVEL_CHARCOUNT];
@@ -68 +70 @@
   char * opath;
   char * dir;
+
+  char * js_dir;
+  char * js_temp_dir;
+  unsigned int pending_js_saves;
+  void * save_callback_context;
+  ladish_save_complete_callback save_callback;
+
   char * project_name;
   uint64_t version;
@@ -86 +95 @@
 
   if (strcmp(level, LADISH_APP_LEVEL_0) != 0 &&
-      strcmp(level, LADISH_APP_LEVEL_1) != 0&&
-      strcmp(level, LADISH_APP_LEVEL_LASH) != 0)
+      strcmp(level, LADISH_APP_LEVEL_1) != 0 &&
+      strcmp(level, LADISH_APP_LEVEL_LASH) != 0 &&
+      strcmp(level, LADISH_APP_LEVEL_JACKSESSION) != 0)
   {
     return false;
@@ -155 +165 @@
 
   supervisor_ptr->dir = NULL;
+
+  supervisor_ptr->js_temp_dir = NULL;
+  supervisor_ptr->js_dir = NULL;
+  supervisor_ptr->pending_js_saves = 0;
+  supervisor_ptr->save_callback_context = NULL;
+  supervisor_ptr->save_callback = NULL;
+
   supervisor_ptr->project_name = NULL;
 
@@ -207 +224 @@
   free(app_ptr->name);
   free(app_ptr->commandline);
+  free(app_ptr->js_commandline);
   free(app_ptr);
 }
@@ -251 +269 @@
 }
 
+static void ladish_js_save_complete(struct ladish_app_supervisor * supervisor_ptr)
+{
+  struct list_head * node_ptr;
+  struct ladish_app * app_ptr;
+  bool success;
+
+  ASSERT(supervisor_ptr->js_temp_dir != NULL);
+  ASSERT(supervisor_ptr->js_dir != NULL);
+  ASSERT(supervisor_ptr->pending_js_saves == 0);
+
+  /* find whether all strdup() calls for new commandlines succeeded */
+  list_for_each(node_ptr, &supervisor_ptr->applist)
+  {
+    app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
+    if (app_ptr->state == LADISH_APP_STATE_STARTED &&
+        strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0 &&
+        app_ptr->js_commandline == NULL)
+    { /* a strdup() call has failed, free js commandline buffers allocated by succeeded strdup() calls */
+      list_for_each(node_ptr, &supervisor_ptr->applist)
+      {
+        app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
+        free(app_ptr->js_commandline);
+        app_ptr->js_commandline = NULL;
+      }
+      goto fail_rm_temp_dir;
+    }
+  }
+
+  /* move js_dir to js_dir.1; move js_temp_dir to js_dir  */
+  success = ladish_rotate(supervisor_ptr->js_temp_dir, supervisor_ptr->js_dir, 10);
+  if (!success)
+  {
+    goto fail_rm_temp_dir;
+  }
+
+  list_for_each(node_ptr, &supervisor_ptr->applist)
+  {
+    app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
+    if (app_ptr->state == LADISH_APP_STATE_STARTED &&
+        strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0)
+    {
+      ASSERT(app_ptr->commandline != NULL);
+      ASSERT(app_ptr->js_commandline != NULL);
+      free(app_ptr->commandline);
+      app_ptr->commandline = app_ptr->js_commandline;
+      app_ptr->js_commandline = NULL;
+    }
+  }
+
+  goto done;
+
+fail_rm_temp_dir:
+  if (!ladish_rmdir_recursive(supervisor_ptr->js_temp_dir))
+  {
+    log_error("Cannot remove JS temp dir '%s'", supervisor_ptr->js_temp_dir);
+  }
+
+done:
+  free(supervisor_ptr->js_temp_dir);
+  supervisor_ptr->js_temp_dir = NULL;
+
+  supervisor_ptr->save_callback(supervisor_ptr->save_callback_context, success);
+  supervisor_ptr->save_callback = NULL;
+  supervisor_ptr->save_callback_context = NULL;
+}
+
 #define supervisor_ptr ((struct ladish_app_supervisor *)supervisor_handle)
 
@@ -334 +418 @@
   {
     log_error("invalid level '%s'", level);
-    return NULL;
+    goto fail;
+  }
+
+  if (strcmp(level, LADISH_APP_LEVEL_JACKSESSION) == 0 &&
+      supervisor_ptr->dir == NULL)
+  {
+    log_error("jack session apps need directory");
+    goto fail;
   }
 
@@ -341 +432 @@
   {
     log_error("malloc of struct ladish_app failed");
-    return NULL;
+    goto fail;
   }
 
@@ -348 +439 @@
   {
     log_error("strdup() failed for app name");
-    free(app_ptr);
-    return NULL;
+    goto free_app;
   }
 
@@ -356 +446 @@
   {
     log_error("strdup() failed for app commandline");
-    free(app_ptr->name);
-    free(app_ptr);
-    return NULL;
-  }
+    goto free_name;
+  }
+
+  app_ptr->js_commandline = NULL;
 
   app_ptr->dbus_name = NULL;
@@ -419 +509 @@
 
   return (ladish_app_handle)app_ptr;
+
+free_name:
+  free(app_ptr->name);
+free_app:
+  free(app_ptr);
+fail:
+  return NULL;
 }
 
@@ -623 +720 @@
 }
 
+#define app_ptr ((struct ladish_app *)context)
+
+static void ladish_js_app_save_complete(void * context, const char * commandline)
+{
+  log_info("JS app saved, commandline '%s'", commandline);
+  ASSERT(app_ptr->supervisor->js_temp_dir != NULL);
+
+  ASSERT(app_ptr->js_commandline == NULL);
+  app_ptr->js_commandline = strdup(commandline);
+  if (app_ptr->js_commandline == NULL)
+  {
+    log_error("strdup() failed for JS app '%s' commandline '%s'", app_ptr->name, commandline);
+  }
+
+  if (app_ptr->supervisor->pending_js_saves != 1)
+  {
+    ASSERT(app_ptr->supervisor->pending_js_saves > 1);
+    app_ptr->supervisor->pending_js_saves--;
+    log_info("%u more JS apps are still saving", app_ptr->supervisor->pending_js_saves);
+    return;
+  }
+
+  log_info("Last JS app saved");
+  app_ptr->supervisor->pending_js_saves = 0;
+
+  ladish_js_save_complete(app_ptr->supervisor);
+}
+
+#undef app_ptr
+
 static inline void ladish_app_initiate_save(struct ladish_app * app_ptr)
 {
@@ -629 +756 @@
   {
     ladish_app_initiate_lash_save(app_ptr, app_ptr->supervisor->dir != NULL ? app_ptr->supervisor->dir : g_base_dir);
+  }
+  else if (strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0)
+  {
+    log_info("Initiating JACK session save for '%s'", app_ptr->name);
+    ladish_js_save_app(app_ptr->uuid, app_ptr->supervisor->js_temp_dir, app_ptr, ladish_js_app_save_complete);
   }
   else if (strcmp(app_ptr->level, LADISH_APP_LEVEL_1) == 0)
@@ -659 +791 @@
   bool lifeless;
 
+  free(supervisor_ptr->js_temp_dir);
+  supervisor_ptr->js_temp_dir = NULL;
+  free(supervisor_ptr->js_dir);
+  supervisor_ptr->js_dir = NULL;
   free(supervisor_ptr->dir);
   supervisor_ptr->dir = NULL;
@@ -701 +837 @@
 {
   char * dup;
+  char * js_dir;
+
+  ASSERT(supervisor_ptr->pending_js_saves == 0);
 
   dup = strdup(dir);
@@ -709 +848 @@
   }
 
-  if (supervisor_ptr->dir != NULL)
-  {
-    free(supervisor_ptr->dir);
-  }
-
+  js_dir = catdup(dir, "/js_apps");
+  if (js_dir == NULL)
+  {
+    log_error("catdup() failed to compose supervisor js dir path");
+    free(dup);
+    return false;
+  }
+
+  free(supervisor_ptr->dir);
   supervisor_ptr->dir = dup;
+
+  free(supervisor_ptr->js_dir);
+  supervisor_ptr->js_dir = js_dir;
 
   return true;
@@ -812 +958 @@
 bool ladish_app_supervisor_start_app(ladish_app_supervisor_handle supervisor_handle, ladish_app_handle app_handle)
 {
+  char uuid_str[37];
+  char * js_dir;
+  bool ret;
+
   app_ptr->zombie = false;
 
   ASSERT(app_ptr->pid == 0);
 
-  if (!loader_execute(
-        supervisor_ptr->name,
-        supervisor_ptr->project_name,
-        app_ptr->name,
-        supervisor_ptr->dir != NULL ? supervisor_ptr->dir : "/",
-        app_ptr->terminal,
-        app_ptr->commandline,
-        &app_ptr->pid))
+  if (strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0)
+  {
+    uuid_unparse(app_ptr->uuid, uuid_str);
+    js_dir = catdup4(supervisor_ptr->js_dir, "/", uuid_str, "/");
+    if (js_dir == NULL)
+    {
+      log_error("catdup4() failed to compose app jack session dir");
+      return false;
+    }
+  }
+  else
+  {
+    js_dir = NULL;
+  }
+
+  ret = loader_execute(
+    supervisor_ptr->name,
+    supervisor_ptr->project_name,
+    app_ptr->name,
+    supervisor_ptr->dir != NULL ? supervisor_ptr->dir : "/",
+    js_dir,
+    app_ptr->terminal,
+    app_ptr->commandline,
+    &app_ptr->pid);
+
+  free(js_dir);
+
+  if (!ret)
   {
     return false;
@@ -869 +1039 @@
   ladish_app_send_signal(app_ptr, SIGKILL, false);
   app_ptr->state = LADISH_APP_STATE_KILL;
-}
-
-void ladish_app_save(ladish_app_handle app_handle)
-{
-  ladish_app_initiate_save(app_ptr);
 }
 
@@ -1007 +1172 @@
   struct list_head * node_ptr;
   struct ladish_app * app_ptr;
+  bool success;
+
+  ASSERT(supervisor_ptr->js_temp_dir == NULL);
+  ASSERT(supervisor_ptr->pending_js_saves == 0);
+  list_for_each(node_ptr, &supervisor_ptr->applist)
+  {
+    app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
+    if (app_ptr->state == LADISH_APP_STATE_STARTED &&
+        strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0)
+    {
+      ASSERT(app_ptr->js_commandline == NULL);
+      supervisor_ptr->pending_js_saves++;
+    }
+  }
+
+  if (supervisor_ptr->pending_js_saves > 0)
+  {
+    ASSERT(supervisor_ptr->dir != NULL);
+    supervisor_ptr->js_temp_dir = catdup(supervisor_ptr->dir, "/js_apps.tmpXXXXXX");
+    if (supervisor_ptr->js_temp_dir == NULL)
+    {
+      log_error("catdup() failed to compose supervisor js temp dir path template");
+      goto reset_js_pending_saves;
+    }
+
+    if (mkdtemp(supervisor_ptr->js_temp_dir) == NULL)
+    {
+      log_error("mkdtemp('%s') failed. errno = %d (%s)", supervisor_ptr->js_temp_dir, errno, strerror(errno));
+      goto free_js_temp_dir;
+    }
+
+    log_info("saving %u JACK session apps to '%s'", supervisor_ptr->pending_js_saves, supervisor_ptr->js_temp_dir);
+
+    supervisor_ptr->save_callback_context = context;
+    supervisor_ptr->save_callback = callback;
+  }
+  else
+  {
+    ASSERT(supervisor_ptr->save_callback_context == NULL);
+    ASSERT(supervisor_ptr->save_callback == NULL);
+  }
 
   list_for_each(node_ptr, &supervisor_ptr->applist)
@@ -1025 +1231 @@
   }
 
-  callback(context, true);
+  success = true;
+  goto exit;
+
+free_js_temp_dir:
+  free(supervisor_ptr->js_temp_dir);
+  supervisor_ptr->js_temp_dir = NULL;
+reset_js_pending_saves:
+  supervisor_ptr->pending_js_saves = 0;
+  success = false;
+exit:
+  if (supervisor_ptr->pending_js_saves == 0)
+  {
+    ASSERT(supervisor_ptr->save_callback == NULL);
+    ASSERT(callback != NULL);
+    callback(context, success);
+  }
 }
 

daemon/app_supervisor.h

@@ -36 +36 @@
 #define LADISH_APP_STATE_KILL       3 /**< @brief app is being force killed */
 
-#define MAX_LEVEL_CHARCOUNT 10  /* includes terminating nul char */
+#define MAX_LEVEL_CHARCOUNT 12  /* includes terminating nul char */
 
 /**
@@ -427 +427 @@
 
 /**
- * Initiate save of app internal state. The app must be in started state.
- *
- * @param[in] app_handle Handle of app
- */
-void ladish_app_save(ladish_app_handle app_handle);
-
-/**
  * Initiate restore of app internal state. The app must be in started state.
  *

daemon/loader.c

@@ -264 +264 @@
   const char * commandline,
   const char * working_dir,
+  const char * session_dir,
   bool run_in_terminal,
   const char * vgraph_name,
@@ -295 +296 @@
   {
     setenv("LADISH_PROJECT_NAME", project_name, true);
+  }
+
+  if (session_dir != NULL)
+  {
+    setenv("SESSION_DIR", session_dir, true);
   }
 
@@ -522 +528 @@
   const char * app_name,
   const char * working_dir,
+  const char * session_dir,
   bool run_in_terminal,
   const char * commandline,
@@ -635 +642 @@
     set_ldpreload();
 
-    loader_exec_program(commandline, working_dir, run_in_terminal, vgraph_name, project_name, app_name);
+    loader_exec_program(commandline, working_dir, session_dir, run_in_terminal, vgraph_name, project_name, app_name);
 
     return false;  /* We should never get here */

daemon/loader.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010, 2011 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -36 +36 @@
   const char * app_name,
   const char * working_dir,
+  const char * session_dir,
   bool run_in_terminal,
   const char * commandline,

daemon/room_load.c

@@ -872 +872 @@
   XML_SetUserData(parser, &parse_context);
 
+  ladish_app_supervisor_set_directory(room_ptr->app_supervisor, project_dir);
+  if (!ladish_app_supervisor_set_project_name(room_ptr->app_supervisor, room_ptr->project_name))
+  {
+    ladish_app_supervisor_set_project_name(room_ptr->app_supervisor, NULL);
+  }
+
   xmls = XML_ParseBuffer(parser, bytes_read, XML_TRUE);
   if (xmls == XML_STATUS_ERROR && !parse_context.error)
@@ -886 +892 @@
   ladish_graph_dump(room_ptr->graph);
   ladish_app_supervisor_dump(room_ptr->app_supervisor);
-
-  ladish_app_supervisor_set_directory(room_ptr->app_supervisor, project_dir);
-  if (!ladish_app_supervisor_set_project_name(room_ptr->app_supervisor, room_ptr->project_name))
-  {
-    ladish_app_supervisor_set_project_name(room_ptr->app_supervisor, NULL);
-  }
 
   ladish_graph_trick_dicts(room_ptr->graph);

gui/dialogs.c

@@ -56 +56 @@
   gtk_widget_set_sensitive(GTK_WIDGET(level1_button), TRUE);
   gtk_widget_set_sensitive(GTK_WIDGET(level2lash_button), TRUE);
+  gtk_widget_set_sensitive(GTK_WIDGET(level2js_button), is_room_view(view));
 
   gtk_window_set_focus(GTK_WINDOW(g_app_dialog), GTK_WIDGET(command_entry));

gui/gladish.ui

@@ -1259 +1259 @@
                 <property name="group">app_level0</property>
                 <property name="receives_default">False</property>
-                <property name="sensitive">False</property>
+                <property name="sensitive">True</property>
                 <property name="visible">True</property>
               </object>

gui/world_tree.c

@@ -268 +268 @@
   gtk_widget_set_sensitive(GTK_WIDGET(level1_button), !running);
   gtk_widget_set_sensitive(GTK_WIDGET(level2lash_button), !running);
+  gtk_widget_set_sensitive(GTK_WIDGET(level2js_button), !running && is_room_view(view));
 
   /* comparing pointers here is ok, because ladish_map_app_level_constant() was called by ladish_app_supervisor_get_app_properties() */