Changeset 1044

Timestamp:

06/09/06 06:13:06 (2 years ago)

Author:

ehabkost

Message:

Use osync_queue_new_pipes() for commands_{to,from}_self

As pipes aren't opened with O_NONBLOCK, the engine can't open both sides
of the .opensync/engines/enginepipe pipe because it will keep waiting
for the other side to be opened.

But as the 'enginepipe' pipe is used only for the engine
sending messages to itself, osync_queue_new_pipes() fits
perfectly for this task.

This also makes the code simpler as it doesn't need to touch the
filesystem. At least for the 'enginepipe' queues -- the osplugin queues
still live in the filesystem.

Signed-off-by: Eduardo Habkost <ehabkost@…>

Files:

• branches/ipc-branch/osengine/osengine_engine.c (modified) (5 diffs)

branches/ipc-branch/osengine/osengine_engine.c

@@ -127 +127 @@
 void send_engine_changed(OSyncEngine *engine)
 {
+        if (!engine->is_initialized)
+                return;
+
         OSyncMessage *message = osync_message_new(OSYNC_MESSAGE_ENGINE_CHANGED, 0, NULL);
         /*FIXME: Handle errors here */
@@ -517 +520 @@
         }
 
-        engine->commands_from_self = osync_queue_new(path, error);
-        engine->commands_to_self = osync_queue_new(path, error);
-        if (!engine->commands_from_self || !engine->commands_to_self)
-                goto error_free_paths;
-        
         engine->syncing_mutex = g_mutex_new();
         engine->info_received_mutex = g_mutex_new();
@@ -790 +788 @@
         engine->is_initialized = TRUE;
         
-        osync_queue_create(engine->commands_from_self, NULL);
-        
         osync_trace(TRACE_INTERNAL, "Spawning clients");
         GList *c = NULL;
@@ -815 +811 @@
         }
         
-        osync_queue_set_message_handler(engine->commands_from_self, (OSyncMessageHandler)engine_message_handler, engine);
-        if (!(engine->man_dispatch))
-                osync_queue_setup_with_gmainloop(engine->commands_from_self, engine->context);
-        
         osync_trace(TRACE_INTERNAL, "opening engine queue");
+        if (!osync_queue_new_pipes(&engine->commands_from_self, &engine->commands_to_self, error)) {
+                osync_group_unlock(engine->group, TRUE);
+                osync_trace(TRACE_EXIT_ERROR, "osengine_init: %s", osync_error_print(error));
+                return FALSE;
+        }
+
         if (!osync_queue_connect(engine->commands_from_self, OSYNC_QUEUE_RECEIVER, 0 )) {
                 osync_group_unlock(engine->group, TRUE);
@@ -831 +829 @@
                 return FALSE;
         }
+        
+        osync_queue_set_message_handler(engine->commands_from_self, (OSyncMessageHandler)engine_message_handler, engine);
+        if (!(engine->man_dispatch))
+                osync_queue_setup_with_gmainloop(engine->commands_from_self, engine->context);
         
         osync_trace(TRACE_INTERNAL, "initializing clients");