Changeset 116

Timestamp:

03/16/06 23:35:16 (3 years ago)

Author:

abauer

Message:

Lots of modification regarding memory handling

Optimised the speed

Optimised memory usage

Made libsoup, obex, wbxml optional for the build

Files:

• branches/development-branch/acinclude.m4 (modified) (1 diff)
• branches/development-branch/configure.ac (modified) (4 diffs)
• branches/development-branch/libsyncml/objects/sml_devinf_obj.c (modified) (1 diff)
• branches/development-branch/libsyncml/objects/sml_ds_server.c (modified) (30 diffs)
• branches/development-branch/libsyncml/objects/sml_ds_server.h (modified) (1 diff)
• branches/development-branch/libsyncml/objects/sml_ds_server_internals.h (modified) (2 diffs)
• branches/development-branch/libsyncml/parser/Makefile.am (modified) (1 diff)
• branches/development-branch/libsyncml/parser/sml_wbxml.c (modified) (2 diffs)
• branches/development-branch/libsyncml/parser/sml_xml_assm.c (modified) (23 diffs)
• branches/development-branch/libsyncml/parser/sml_xml_parse.c (modified) (32 diffs)
• branches/development-branch/libsyncml/sml_command.c (modified) (6 diffs)
• branches/development-branch/libsyncml/sml_elements.c (modified) (3 diffs)
• branches/development-branch/libsyncml/sml_elements.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_elements_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_error.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_manager.c (modified) (32 diffs)
• branches/development-branch/libsyncml/sml_manager.h (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_manager_internals.h (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_notification.c (modified) (1 diff)
• branches/development-branch/libsyncml/sml_parse.c (modified) (5 diffs)
• branches/development-branch/libsyncml/sml_parse.h (modified) (2 diffs)
• branches/development-branch/libsyncml/sml_queue.c (modified) (15 diffs)
• branches/development-branch/libsyncml/sml_session.c (modified) (29 diffs)
• branches/development-branch/libsyncml/sml_session.h (modified) (1 diff)
• branches/development-branch/libsyncml/sml_support.c (modified) (3 diffs)
• branches/development-branch/libsyncml/sml_transport.c (modified) (3 diffs)
• branches/development-branch/libsyncml/transports/Makefile.am (modified) (1 diff)
• branches/development-branch/libsyncml/transports/http_client.c (modified) (7 diffs)
• branches/development-branch/libsyncml/transports/http_client_internals.h (modified) (1 diff)
• branches/development-branch/libsyncml/transports/http_server.c (modified) (2 diffs)
• branches/development-branch/libsyncml/transports/obex_client.c (modified) (2 diffs)
• branches/development-branch/libsyncml/transports/obex_server.c (modified) (2 diffs)
• branches/development-branch/tests/Makefile.am (modified) (2 diffs)
• branches/development-branch/tests/check_ds.c (modified) (41 diffs)
• branches/development-branch/tests/check_elements.c (modified) (1 diff)
• branches/development-branch/tests/check_manager.c (modified) (6 diffs)
• branches/development-branch/tests/check_session.c (modified) (31 diffs)
• branches/development-branch/tests/check_wbxml_assembler.c (modified) (13 diffs)
• branches/development-branch/tests/check_wbxml_parser.c (modified) (3 diffs)
• branches/development-branch/tests/check_xml_assembler.c (modified) (28 diffs)
• branches/development-branch/tests/valgrind.supp (modified) (1 diff)
• branches/development-branch/tools/syncml-http-server.c (modified) (1 diff)
• branches/development-branch/tools/syncml-obex-client.c (modified) (6 diffs)

branches/development-branch/acinclude.m4

@@ -38 +38 @@
-                AC_SUBST(WBXML_LIBS)
-        fi
+        
+        AM_CONDITIONAL(ENABLE_WBXML, test x$LIBWBXML = xyes)
-        
-    CFLAGS="$ac_save_CFLAGS"

branches/development-branch/configure.ac

@@ -24 +24 @@
-AC_SUBST(LIBXML_LIBS)
-
-fixed 
+
-AC_ARG_ENABLE(http,
-  AS_HELP_STRING([--enable-http], [enable http transports]),
@@ -46 +46 @@
-        fi
-fi
-
+
+
-#### Check for openobex ####
-AC_ARG_ENABLE(obex,
@@ -71 +72 @@
-        fi
-fi
+AM_CONDITIONAL(ENABLE_OBEX, test x$HAVE_OPENOBEX = xyes)
-
-#### Ask if the tools are needed ####
@@ -99 +101 @@
-        AC_SUBST(ENABLE_TRACE)
-fi
+AM_CONDITIONAL(ENABLE_TRACE, test x$WITH_TRACE = xyes)
-
-#### Check for glib ####

branches/development-branch/libsyncml/objects/sml_devinf_obj.c

@@ -255 +255 @@
-                goto error;
-        
-
-
-
-
-
-
-
-
+NULL, 
+
+NULL, 
+
+
+NULL, 
+
+NULL, 
-                goto error_free_loc;
-        

branches/development-branch/libsyncml/objects/sml_ds_server.c

@@ -36 +36 @@
-/*@{*/
-
-typedef struct SmlWriteContext {
-        SmlDsSessionWriteCb callback;
-        char *uid;
-        char *newuid;
-        SmlStatus *status;
-        void *userdata;
-        SmlChangeType type;
-        SmlDsSession *session;
-} SmlWriteContext;
-
-static void _alert_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
-        SmlDsSession *dsession = userdata;
-        
-        if (dsession->sentAlertCallback)
-                dsession->sentAlertCallback(session, status, dsession->sentAlertCallbackUserdata);
-        
-        dsession->sentAlertCallback = NULL;
-        dsession->sentAlertCallbackUserdata = NULL;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-static void _sync_reply(SmlSession *session, SmlStatus *status, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, status, userdata);
-        SmlDsSession *dsession = userdata;
-        
-        if (dsession->sentSyncCallback)
-                dsession->sentSyncCallback(session, status, dsession->sentSyncCallbackUserdata);
-        
-        dsession->sentSyncCallback = NULL;
-        dsession->sentSyncCallbackUserdata = NULL;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void smlDsSessionRecvAlert(SmlSession *session, SmlCommand *cmd, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
-        SmlDsSession *dsession = userdata;
-        
-        dsession->alertCommand = cmd;
-        
-        dsession->location = smlLocationClone(cmd->target, NULL);
-        dsession->target = smlLocationClone(cmd->source, NULL);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-static SmlWriteContext *_write_context_find(SmlDsSession *dsession, const char *uid, SmlChangeType type)
-{
@@ -104 +53 @@
-}
-
+static void _write_context_free(SmlWriteContext *ctx)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, ctx);
+
+        if (ctx->status)
+                smlStatusUnref(ctx->status);
+        
+        if (ctx->uid)
+                g_free(ctx->uid);
+                
+        if (ctx->newuid)
+                g_free(ctx->newuid);
+        
+        g_free(ctx);
+
+        smlTrace(TRACE_EXIT, "%s", __func__);
+}
+
-static void _write_context_dispatch(SmlDsSession *dsession, SmlWriteContext *ctx)
-{
@@ -117 +84 @@
-        if (((ctx->type != SML_CHANGE_ADD || smlStatusGetClass(ctx->status) != SML_ERRORCLASS_SUCCESS) && !ctx->newuid) || dsession->server->servertype == SML_DS_CLIENT) {
-                ctx->callback(dsession, ctx->status, NULL, ctx->userdata);
-
-
+
+
+
-                dsession->pendingMaps = g_list_remove(dsession->pendingMaps, ctx);
-                smlTrace(TRACE_EXIT, "%s", __func__);
@@ -130 +98 @@
-        
-        ctx->callback(dsession, ctx->status, ctx->newuid, ctx->userdata);
-g_free(ctx->uid);
-g_free(ctx->newuid
-g_free(ctx);
+
+_write_context_free(ctx
+       
-        dsession->pendingMaps = g_list_remove(dsession->pendingMaps, ctx);
-
-        smlTrace(TRACE_EXIT, "%s: Dispatched add", __func__);
-}
-
-
-
+
+
+
+
-        SmlDsSession *dsession = userdata;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        SmlDsSession *dsession = userdata;
-        
-
-
-
+
+
+
+
+
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -197 +155 @@
-        
-        ctx->status = status;
+        smlStatusRef(status);
-        _write_context_dispatch(dsession, ctx);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-}
-
-void smlDsSessionRecvMap(SmlSession *session, SmlCommand *cmd, void *userdata)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
-        SmlDsSession *dsession = userdata;
-        SmlError *error = NULL;
-        
-        SmlStatus *reply = smlCommandNewReply(cmd, SML_NO_ERROR, &error);
-        if (!reply)
-                goto error;
-        
-        if (!smlSessionSendReply(session, reply, &error))
-                goto error;
-        
-        GList *m = NULL;
-        for (m = cmd->private.map.items; m; m = m->next) {
-                SmlMapItem *item = m->data;
-                SmlWriteContext *ctx = _write_context_find(dsession, item->target->locURI, SML_CHANGE_ADD);
-                if (ctx) {
-                        ctx->newuid = g_strdup(item->source->locURI);
-                        _write_context_dispatch(dsession, ctx);
-                }
-        }
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return;
-        
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
-        smlErrorDeref(&error);
-}
-
-SmlDsSession *smlDsServerRecvAlert(SmlDsServer *server, SmlSession *session, SmlCommand *cmd)
-{
-        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, server, session, cmd);
-        SmlError *error = NULL;
-        
-        server->target = smlLocationClone(session->target, &error);
-        if (!server->target)
-                goto error;
-        
-        SmlDsSession *dsession = smlDsSessionNew(server, session, &error);
-        if (!dsession)
-                goto error_free_target;
-        
-        smlDsSessionRecvAlert(session, cmd, dsession);
-        
-        if (server->connectCallback)
-                server->connectCallback(dsession, server->connectCallbackUserdata);
-        
-        server->target = smlLocationClone(cmd->source, &error);
-        if (!server->target)
-                goto error_free_dsession;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return dsession;
-
-error_free_dsession:
-        g_free(dsession);
-error_free_target:
-        smlLocationUnref(server->target);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
-        smlErrorDeref(&error);
-        return NULL;
-}
-
@@ -287 +180 @@
-                goto error;
-
-
-
-
+
+
-
-        server->contenttype = type;
@@ -297 +189 @@
-        return server;
-
-error_free_server:
-        g_free(server);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
@@ -314 +204 @@
-                goto error;
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-        server->contenttype = type;
@@ -328 +216 @@
-        return server;
-
-error_free_location:
-        smlLocationUnref(server->location);
-error_free_server:
-        g_free(server);
-error:
-        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
@@ -344 +228 @@
-        if (server->location)
-                smlLocationUnref(server->location);
+                
+        if (server->target)
+                smlLocationUnref(server->target);
-        
-        g_free(server);
@@ -401 +288 @@
-}
-
+SmlDsSession *smlDsServerRecvAlert(SmlDsServer *server, SmlSession *session, SmlCommand *cmd)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, server, session, cmd);
+        SmlError *error = NULL;
+        
+        SmlDsSession *dsession = smlDsSessionNew(server, session, &error);
+        if (!dsession)
+                goto error;
+        
+        smlDsSessionRecvAlert(session, cmd, dsession);
+        
+        if (server->connectCallback)
+                server->connectCallback(dsession, server->connectCallbackUserdata);
+        
+        smlDsSessionUnref(dsession);
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return dsession;
+
+error:
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
+        smlErrorDeref(&error);
+        return NULL;
+}
+
-SmlDsSession *smlDsServerSendAlert(SmlDsServer *server, SmlSession *session, SmlAlertType type, const char *last, const char *next, SmlStatusReplyCb callback, void *userdata, SmlError **error)
-{
@@ -411 +323 @@
-                goto error;
-        
-
-
+
-                goto error_free_session;
-        
-        if (!smlDsSessionSendAlert(dsession, type, last, next, callback, userdata, error))
-                goto error_free_target;
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return dsession;
-
-error_free_target:
-        smlLocationUnref(server->target);
-error_free_session:
-        g_free(dsession);
@@ -443 +349 @@
-        dsession->lock = g_mutex_new();
-        dsession->syncReply = SML_ERROR_UNKNOWN;
+        dsession->refCount = 1;
+        
+        if (server->servertype == SML_DS_CLIENT) {
+                dsession->target = server->target;
+                smlLocationRef(dsession->target);
+        }
+        
+        dsession->location = server->location;
+        smlLocationRef(dsession->location);
-        
-        smlTrace(TRACE_EXIT, "%s: %p", __func__, dsession);
@@ -452 +367 @@
-}
-
-Free
+Ref
-{
-        smlTrace(TRACE_ENTRY, "%s(%p)", __func__, dsession);
-        smlAssert(dsession);
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -470 +437 @@
-        if (dsession->alertCommand && dsession->recvAlertCallback) {
-                smlTrace(TRACE_ENTRY, "%s(%p): Dispatching alert", __func__, dsession);
+                
+                g_mutex_lock(dsession->lock);
-                SmlErrorType type = SML_NO_ERROR;
-                if (!dsession->recvAlertCallback(dsession, dsession->alertCommand->private.alert.type, dsession->alertCommand->private.alert.anchor->last, dsession->alertCommand->private.alert.anchor->next, dsession->recvAlertCallbackUserdata))
@@ -481 +450 @@
-                if (!smlSessionSendReply(dsession->session, reply, &error))
-                        goto error;
-
+
+
+
+
+
-                dsession->alertCommand = NULL;
-
+                g_mutex_unlock(dsession->lock);
-                smlTrace(TRACE_EXIT, "%s", __func__);
-        } else if (dsession->recvSync && dsession->recvSyncCallback) {
-                smlTrace(TRACE_ENTRY, "%s(%p): Dispatching sync", __func__, dsession);
-                
+                g_mutex_lock(dsession->lock);
-                dsession->recvSyncCallback(dsession, ((SmlCommand *)(dsession->recvSync->data))->private.sync.numChanged, dsession->changesCallbackUserdata);
-                dsession->recvSyncCallback = NULL;
-                
-GList *c = NULL;
-for (c = dsession->recvSync; c; c = c->next) {
-SmlCommand *cmd = (SmlCommand *)(c->data);
+while (dsession->recvSync) {
+       SmlCommand *cmd = dsession->recvSync->data;
+
-                        smlTrace(TRACE_INTERNAL, "answering sync command with cmdRef %i and msgRef %i", cmd->cmdID, cmd->msgID);
-                        SmlStatus *reply = smlCommandNewReply(cmd, SML_NO_ERROR, &error);
@@ -501 +476 @@
-                        if (!smlSessionSendReply(dsession->session, reply, &error))
-                                goto error;
+                                
+                        smlStatusUnref(reply);
+                        
+                        smlCommandUnref(cmd);
+                        dsession->recvSync = g_list_delete_link(dsession->recvSync, dsession->recvSync);
-                }
-                
-                dsession->syncReply = SML_NO_ERROR;
-                
-
-
-
+
-                smlTrace(TRACE_EXIT, "%s", __func__);
-        } else if (dsession->recvChanges && dsession->changesCallback) {
@@ -520 +498 @@
-                                if (!item || (!item->source && !item->target)) {
-                                        smlErrorSet(&error, SML_ERROR_GENERIC, "No item");
-_unlock
+
-                                }
-                                
@@ -527 +505 @@
-                                 * source uri. This has then to be translated by the sync engine of course */
-                                if (!dsession->changesCallback(dsession, cmd->private.change.type, item->target ? item->target->locURI : item->source->locURI, item->data, item->size, item->contenttype, dsession->changesCallbackUserdata, &error))
-_unlock
+
-                                                
-                                if (cmd->private.change.type == SML_CHANGE_ADD)
@@ -535 +513 @@
-                                
-                                if (!reply)
-_unlock
+
-                                
-                                if (!smlSessionSendReply(dsession->session, reply, &error))
-
+
+
+
+
+
-                        }
-                        
+                        
-                        dsession->recvChanges = g_list_delete_link(dsession->recvChanges, dsession->recvChanges);
-                }
@@ -550 +533 @@
-        return;
-
-error_unlock:
-        g_mutex_unlock(dsession->lock);
-error:
-        if (reply)
-                smlStatusUnref(reply);
+        g_mutex_unlock(dsession->lock);
-        smlTrace(TRACE_EXIT_ERROR, "%s: Unable to dispatch: %s", __func__, smlErrorPrint(&error));
-        smlErrorDeref(&error);
@@ -566 +548 @@
-                return TRUE;
-        return FALSE;
+}
+
+void smlDsSessionRecvAlert(SmlSession *session, SmlCommand *cmd, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
+        SmlDsSession *dsession = userdata;
+        SmlError *error = NULL;
+        smlAssert(dsession->location);
+        
+        g_mutex_lock(dsession->lock);
+        
+        if (!cmd->target || !cmd->source) {
+                SmlStatus *reply = smlCommandNewReply(cmd, SML_ERROR_BAD_REQUEST, &error);
+                if (!reply)
+                        goto error;
+                
+                if (!smlSessionSendReply(session, reply, &error)) {
+                        smlStatusUnref(reply);
+                        goto error;
+                }
+                
+                smlStatusUnref(reply);
+                        
+                smlTrace(TRACE_EXIT, "%s: Alert had no target or source", __func__);
+                return;
+        }
+        
+        if (!smlLocationCompare(NULL, dsession->location, NULL, cmd->target)) {
+                SmlStatus *reply = smlCommandNewReply(cmd, SML_ERROR_NOT_FOUND, &error);
+                if (!reply)
+                        goto error;
+                
+                if (!smlSessionSendReply(session, reply, &error)) {
+                        smlStatusUnref(reply);
+                        goto error;
+                }
+                
+                smlStatusUnref(reply);
+                
+                smlTrace(TRACE_EXIT, "%s: Alert does not match our location", __func__);
+                return;
+        }
+        
+        smlCommandRef(cmd);
+        
+        if (!dsession->target) {
+                dsession->target = cmd->source;
+                smlLocationRef(cmd->source);
+        }
+        
+        dsession->alertCommand = cmd;
+        
+        g_mutex_unlock(dsession->lock);
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return;
+
+error:
+        g_mutex_unlock(dsession->lock);
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
+        smlErrorDeref(&error);
+        return;
+}
+
+void smlDsSessionRecvSync(SmlSession *session, SmlCommand *cmd, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
+        SmlDsSession *dsession = userdata;
+        SmlError *error = NULL;
+        
+        g_mutex_lock(dsession->lock);
+        if (dsession->syncReply == SML_ERROR_UNKNOWN) {
+                smlTrace(TRACE_INTERNAL, "Storing sync command with cmdRef %i and msgRef %i", cmd->cmdID, cmd->msgID);
+                smlCommandRef(cmd);
+                dsession->recvSync = g_list_append(dsession->recvSync, cmd);
+        } else {
+                smlTrace(TRACE_INTERNAL, "Using stored sync reply on cmd with cmdRef %i and msgRef %i", cmd->cmdID, cmd->msgID);
+                SmlStatus *reply = smlCommandNewReply(cmd, dsession->syncReply, &error);
+                if (!reply)
+                        goto error;
+                
+                if (!smlSessionSendReply(dsession->session, reply, &error))
+                        goto error;
+                
+                smlStatusUnref(reply);
+        }
+        g_mutex_unlock(dsession->lock);
+
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return;
+        
+error:
+        g_mutex_unlock(dsession->lock);
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
+        smlErrorDeref(&error);
+}
+
+void smlDsSessionRecvChange(SmlSession *session, SmlCommand *cmd, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
+        SmlDsSession *dsession = userdata;
+        
+        g_mutex_lock(dsession->lock);
+        dsession->recvChanges = g_list_append(dsession->recvChanges, cmd);
+        smlCommandRef(cmd);
+        g_mutex_unlock(dsession->lock);
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+}
+
+void smlDsSessionRecvMap(SmlSession *session, SmlCommand *cmd, void *userdata)
+{
+        smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata);
+        SmlDsSession *dsession = userdata;
+        SmlError *error = NULL;
+        
+        g_mutex_lock(dsession->lock);
+        
+        SmlStatus *reply = smlCommandNewReply(cmd, SML_NO_ERROR, &error);
+        if (!reply)
+                goto error;
+        
+        if (!smlSessionSendReply(session, reply, &error))
+                goto error;
+        
+        smlStatusUnref(reply);
+        
+        GList *m = NULL;
+        for (m = cmd->private.map.items; m; m = m->next) {
+                SmlMapItem *item = m->data;
+                SmlWriteContext *ctx = _write_context_find(dsession, item->target->locURI, SML_CHANGE_ADD);
+                if (ctx) {
+                        ctx->newuid = g_strdup(item->source->locURI);
+                        _write_context_dispatch(dsession, ctx);
+                }
+        }
+        
+        g_mutex_unlock(dsession->lock);
+        
+        smlTrace(TRACE_EXIT, "%s", __func__);
+        return;
+        
+error:
+        g_mutex_unlock(dsession->lock);
+        smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error));
+        smlErrorDeref(&error);
-}
-
@@ -620 +748 @@
-        if (!smlSessionSendCommand(dsession->session, alert, NULL, _alert_reply, dsession, error))
-                goto error;
+        
+        smlCommandUnref(alert);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -695 +825 @@
-        dsession->sentSyncCallbackUserdata = userdata;
-        
-server->target, dsession->server
+target, dsession
-        if (!dsession->syncCommand)
-                goto error;
@@ -740 +870 @@
-                goto error_free_ctx;
-        
+        smlCommandUnref(cmd);
+        
-        smlTrace(TRACE_EXIT, "%s", __func__);
-        return TRUE;
@@ -772 +904 @@
-                goto error;
-        
+        smlCommandUnref(dsession->syncCommand);
-        dsession->syncCommand = NULL;
-        
@@ -828 +961 @@
-                if (!smlCommandAddMapItem(cmd, item, error))
-                        goto error_free_cmd;
+                smlMapItemUnref(item);
-                
-                dsession->mapItems = g_list_remove(dsession->mapItems, item);
@@ -834 +968 @@
-        if (!smlSessionSendCommand(dsession->session, cmd, NULL, callback, userdata, error))
-                goto error_free_cmd;
+        
+        smlCommandUnref(cmd);
-        
-        smlTrace(TRACE_EXIT, "%s", __func__);
@@ -867 +1003 @@
-                goto error;
-        
-
+ssion, se
-                goto error_free_dsession;
-        
-
+ssion, se
-                goto error_free_dsession;
-        
@@ -890 +1026 @@
-        smlAssert(manager);
-        
-
+NULL, 
-                goto error;
-