Changeset 6df7809837f5abf82df57c6f8cc01f41b2837648

Timestamp:

10/11/11 03:52:58 (20 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

95fdd69973113d5070481e9ecf7926acc12ba60f

Parents:

88712ad5e512167bcebb1e7e2aed736aead24078

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-11T03:49:03Z+0300

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2011-10-11T03:52:58Z+0300

Message:

Call the save completion callback when ladish_js_save_app() fails. #185

Files:

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

daemon/app_supervisor.c

@@ -286 +286 @@
         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 */
+    { /* a strdup() call has failed, or js save failed for some other reason,
+         free js commandline buffers allocated by succeeded strdup() calls */
       list_for_each(node_ptr, &supervisor_ptr->applist)
       {
@@ -293 +294 @@
         app_ptr->js_commandline = NULL;
       }
+      success = false;
       goto fail_rm_temp_dir;
     }
@@ -724 +726 @@
 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 (commandline != NULL)
+  {
+    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);
+    }
+  }
+  else
+  {
+    ASSERT(app_ptr->js_commandline == NULL);
+    log_error("JACK session save failed for JS app '%s'", app_ptr->name);
   }
 
@@ -742 +752 @@
   }
 
-  log_info("Last JS app saved");
+  log_info("No more pending JS app saves");
   app_ptr->supervisor->pending_js_saves = 0;
 
@@ -760 +770 @@
   {
     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);
+    if (!ladish_js_save_app(app_ptr->uuid, app_ptr->supervisor->js_temp_dir, app_ptr, ladish_js_app_save_complete))
+    {
+      ladish_js_app_save_complete(app_ptr, NULL);
+    }
   }
   else if (strcmp(app_ptr->level, LADISH_APP_LEVEL_1) == 0)
@@ -1174 +1187 @@
   bool success;
 
+  ASSERT(callback != NULL);
+
   ASSERT(supervisor_ptr->js_temp_dir == NULL);
   ASSERT(supervisor_ptr->pending_js_saves == 0);
@@ -1187 +1202 @@
   }
 
+  supervisor_ptr->save_callback_context = context;
+  supervisor_ptr->save_callback = callback;
+
   if (supervisor_ptr->pending_js_saves > 0)
   {
@@ -1204 +1222 @@
 
     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);
   }
 
@@ -1241 +1251 @@
   success = false;
 exit:
-  if (supervisor_ptr->pending_js_saves == 0)
-  {
-    ASSERT(supervisor_ptr->save_callback == NULL);
-    ASSERT(callback != NULL);
+  if (supervisor_ptr->pending_js_saves == 0 && supervisor_ptr->save_callback != NULL)
+  { /* Room/studio without js apps.
+       In case of ladish_js_save_app() failure,
+       the callback will either be called already or
+       will be called later when all pending js app saves are done.
+       In former case callback will be NULL.
+       In latter case pending_js_saves will be greater than zero. */
+    ASSERT(supervisor_ptr->save_callback == callback);
+    ASSERT(supervisor_ptr->save_callback_context = context);
     callback(context, success);
+    supervisor_ptr->save_callback = NULL;
+    supervisor_ptr->save_callback_context = NULL;
   }
 }