Changeset 2511

Timestamp:

09/02/07 18:11:41 (1 year ago)

Author:

dgollub

Message:

Reimplementation of OSYNC_START_TYPE_PROCESS - which allows plugins to
run in a seperate process. This is needed for certain plugins like
kdepim-sync when using GUIs like KitchenSync?, MultiSync?, ....

See http://www.opensync.org/wiki/IPC for more details.

To run your plugin in a seperate process run:

osync_plugin_set_start_type(plugin, OSYNC_START_TYPE_PROCESS);

in the get_sync_info() function.

Implementation details:

osplugin got now called as "osplugin -f X Y".
X and Y are the read and write file descriptor for the pipes. We used to
have some pid files to track and kill them - is this still needed? Could
we got rid of this implemenetation?

TODO: Evalute if the osplugin.pid needs to be implemented
FIXME: No HUP signal got send to the forked client process.. so it
never got stopped -> deadlock.

Files:

• trunk/opensync/client/opensync_client_proxy.c (modified) (9 diffs)

trunk/opensync/client/opensync_client_proxy.c

@@ -35 +35 @@
-
-#include <sys/types.h>
+#include <sys/wait.h>
-#include <signal.h>
-
@@ -78 +79 @@
-
-//portable kill pid helper
+#if 0
-static int _osync_kill(pid_t pid, int sig) 
-{
@@ -106 +108 @@
-#endif //_WIN32
-} 
-
+
+
+
-static char *_osync_client_pid_filename(OSyncClientProxy *proxy)
-{
@@ -112 +116 @@
-}
-
-/*
+
-{
-        char *pidpath = _osync_client_pid_filename(proxy);
@@ -140 +144 @@
-        g_free(pidpath);
-        return TRUE;
-*/
+
-
-static osync_bool _osync_client_kill_old_osplugin(OSyncClientProxy *proxy, OSyncError **error)
@@ -199 +203 @@
-        return ret;
-}
+#endif
-
-/** This function takes care of the messages received on the outgoing (sending)
@@ -800 +805 @@
-                        goto error_free_pipe1;
-                
+                proxy->outgoing = write1;
+                proxy->incoming = read2;
+
-                /* Now we either spawn a new process, or we create a new thread */
-                if (type == OSYNC_START_TYPE_THREAD) {
@@ -822 +830 @@
-                } else {
-                        /* First lets see if the old plugin exists, and kill it if it does */
+#if 0                   
-                        if (!_osync_client_kill_old_osplugin(proxy, error))
-                                goto error;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
+
+
+
+
-                                }
-                                
-
-
+
+
+
+
-                        }
-
-
-
-
-
-
+
+
+
+
+
-                        }
-
-
+
-                }
-
-
-
-
-
-
-
-
-
-
+
-                /* We now connect to our incoming queue */
-                if (!osync_queue_connect(proxy->incoming, OSYNC_QUEUE_RECEIVER, error))
@@ -946 +960 @@
-                osync_client_unref(proxy->client);
-        } else if (proxy->type == OSYNC_START_TYPE_PROCESS) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-                if (!WIFEXITED(status))
-                        osync_trace(TRACE_INTERNAL, "Child has exited abnormally");
-                else if (WEXITSTATUS(status) != 0)
-                        osync_trace(TRACE_INTERNAL, "Child has returned non-zero exit status (%d)", WEXITSTATUS(status));
-
-                if (!osync_client_remove_pidfile(client, error))
-                        goto error;
-        }*/
-                
-                
-                /* First lets see if the old plugin exists, and kill it if it does */
+#if 0
-                if (!_osync_client_kill_old_osplugin(proxy, error))
-                        goto error;
+#endif          
-        }
-