Changeset 244

Timestamp:

06/28/07 11:02:10 (1 year ago)

Author:

prahal

Message:

Added event callback (dgollub) to manage changeset for getChanges event.
Beware that there can be multiple dsession per changeset thus check the session
is final before relying on this callback.

Files:

• trunk/Doxyfile.in (modified) (4 diffs)
• trunk/libsyncml/objects/sml_ds_server.c (modified) (5 diffs)
• trunk/libsyncml/objects/sml_ds_server.h (modified) (3 diffs)
• trunk/libsyncml/objects/sml_ds_server_internals.h (modified) (1 diff)

trunk/Doxyfile.in

@@ -100 +100 @@
-# the base classes will not be shown.
-
-NO
+YES 
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
@@ -1034 +1034 @@
-# have no effect if this option is set to NO (the default)
-
-NO
+YES 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
@@ -1054 +1054 @@
-# Language.
-
-NO
+YES
-
-# If set to YES, the inheritance and collaboration graphs will show the 
@@ -1081 +1081 @@
-# functions only using the \callgraph command.
-
-NO
+YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 

trunk/libsyncml/objects/sml_ds_server.c

@@ -512 +512 @@
-                dsession->syncReply = SML_NO_ERROR;
-                
+                // Now there are no more changes... do some fancy callback. Some applications will love it ;)
+                if (!dsession->recvChanges && dsession->recvEventCallback) {
+                        dsession->recvEventCallback(dsession, SML_DS_EVENT_GOTCHANGES, dsession->recvEventCallbackUserdata);
+                        smlTrace(TRACE_INTERNAL, "recvEventCallback no changes in recvSync callback");
+                }
+
-                smlTrace(TRACE_EXIT, "%s", __func__);
-        } else if (dsession->recvChanges && dsession->changesCallback) {
@@ -517 +523 @@
-                
-                while (dsession->recvChanges) {
+
-                        SmlCommand *cmd = dsession->recvChanges->data;
-                        
@@ -529 +536 @@
-                                 * uid (if we are a client for example). If it is not given we use the
-                                 * source uri. This has then to be translated by the sync engine of course */
-
+
-                                char *data = NULL;
-                                unsigned int size = 0;
@@ -557 +564 @@
-                        dsession->recvChanges = g_list_delete_link(dsession->recvChanges, dsession->recvChanges);
-                }
-
+
+
+
+
+
+
+
-                smlTrace(TRACE_EXIT, "%s", __func__);
+        } else {
+                smlTrace(TRACE_ENTRY, "%s()", __func__);
+                
+                smlTrace(TRACE_INTERNAL, "recvChanges: %p changesCallback: %p", dsession->recvChanges, dsession->changesCallback); 
+
+                smlTrace(TRACE_EXIT, "%s()", __func__);
+
-        }
-
@@ -832 +852 @@
-}
-
+void smlDsSessionGetEvent(SmlDsSession *dsession, SmlDsSessionEventCb eventCallback, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsession, eventCallback, userdata);
+        smlAssert(dsession);
+        smlAssert(eventCallback);
+        
+        dsession->recvEventCallback = eventCallback;
+        dsession->recvEventCallbackUserdata = userdata;
+        
+        //smlDsSessionDispatch(dsession);
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+}
+
+
-/** @brief Start the sync command to send to the other side
- * 

trunk/libsyncml/objects/sml_ds_server.h

@@ -31 +31 @@
-} SmlDsServerType;
-
+typedef enum {
+        SML_DS_EVENT_GOTCHANGES = 0,
+        SML_DS_EVENT_COMMITEDCHANGES = 1
+} SmlDsEvent;
+
-typedef SmlErrorType (* SmlDsServerSanCb) (SmlDsServer *dsserver, SmlAlertType type, void *userdata);
-
@@ -36 +41 @@
-typedef SmlBool (* SmlDsSessionAlertCb) (SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata);
-typedef void (* SmlDsSessionSyncCb) (SmlDsSession *dsession, unsigned int numchanges, void *userdata);
+typedef void (* SmlDsSessionEventCb) (SmlDsSession *dsession, SmlDsEvent event, void *userdata);
-typedef SmlBool (* SmlDsSessionChangesCb) (SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error);
-typedef void (* SmlDsSessionWriteCb) (SmlDsSession *dsession, SmlStatus *status, const char *newuid, void *userdata);
@@ -59 +65 @@
-void smlDsSessionGetChanges(SmlDsSession *dsession, SmlDsSessionChangesCb chgCallback, void *userdata);
-void smlDsSessionGetSync(SmlDsSession *dsession, SmlDsSessionSyncCb chgCallback, void *userdata);
+void smlDsSessionGetEvent(SmlDsSession *dsession, SmlDsSessionEventCb eventCallback, void *userdata);
-SmlBool smlDsSessionSendSync(SmlDsSession *dsession, unsigned int num_changes, SmlStatusReplyCb callback, void *userdata, SmlError **error);
-SmlBool smlDsSessionQueueChange(SmlDsSession *dsession, SmlChangeType type, const char *uid, const char *data, unsigned int size, const char *contenttype, SmlDsSessionWriteCb callback, void *userdata, SmlError **error);

trunk/libsyncml/objects/sml_ds_server_internals.h

@@ -67 +67 @@
-        void *sentSyncCallbackUserdata;
-        
+        /** Callback that will infomration about the Ds Session events */
+        SmlDsSessionEventCb recvEventCallback;
+        void *recvEventCallbackUserdata;
+
-        /** The temporary storage for the sync command to send */
-        SmlCommand *syncCommand;