Menu
▾
▴
[Opensync-commits] r5559 - in trunk: . misc/schemas opensync/client opensync/engine opensync/group opensync/ipc opensync/plugin tests tests/engine-tests tests/mock-plugin tests/sync-tests tools
Author: bellmich Date: Wed Apr 8 17:01:53 2009 New Revision: 5559 URL: http://www.opensync.org/changeset/5559 Log: removed batch_commit (please see ticket #1078) Modified: trunk/misc/schemas/syncmember.xsd trunk/opensync.sym trunk/opensync/client/opensync_client_proxy_private.h trunk/opensync/engine/opensync_engine.h trunk/opensync/group/opensync_group.c trunk/opensync/group/opensync_member.c trunk/opensync/ipc/opensync_serializer.c trunk/opensync/plugin/opensync_objtype_sink.c trunk/opensync/plugin/opensync_objtype_sink.h trunk/opensync/plugin/opensync_objtype_sink_internals.h trunk/opensync/plugin/opensync_objtype_sink_private.h trunk/tests/engine-tests/check_engine_error.c trunk/tests/mock-plugin/mock_sync.c trunk/tests/support.c trunk/tests/sync-tests/check_multisync.c trunk/tools/osyncplugin.c Modified: trunk/misc/schemas/syncmember.xsd ============================================================================== --- trunk/misc/schemas/syncmember.xsd Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/misc/schemas/syncmember.xsd Wed Apr 8 17:01:53 2009 (r5559) @@ -31,7 +31,6 @@ <xsd:element maxOccurs="1" minOccurs="0" name="disconnect" type="xsd:integer" /> <xsd:element maxOccurs="1" minOccurs="0" name="get_changes" type="xsd:integer" /> <xsd:element maxOccurs="1" minOccurs="0" name="commit" type="xsd:integer" /> - <xsd:element maxOccurs="1" minOccurs="0" name="batch_commit" type="xsd:integer" /> <xsd:element maxOccurs="1" minOccurs="0" name="committed_all" type="xsd:integer" /> <xsd:element maxOccurs="1" minOccurs="0" name="sync_done" type="xsd:integer" /> <xsd:element maxOccurs="1" minOccurs="0" name="write" type="xsd:integer" /> Modified: trunk/opensync.sym ============================================================================== --- trunk/opensync.sym Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync.sym Wed Apr 8 17:01:53 2009 (r5559) @@ -391,8 +391,6 @@ osync_objtype_sink_remove_objformat_sink osync_objtype_sink_save_hashtable osync_objtype_sink_set_available -osync_objtype_sink_set_batch_commit_func -osync_objtype_sink_set_batchcommit_timeout osync_objtype_sink_set_commit_func osync_objtype_sink_set_commit_timeout osync_objtype_sink_set_committed_all_func Modified: trunk/opensync/client/opensync_client_proxy_private.h ============================================================================== --- trunk/opensync/client/opensync_client_proxy_private.h Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/client/opensync_client_proxy_private.h Wed Apr 8 17:01:53 2009 (r5559) @@ -32,7 +32,6 @@ #define OSYNC_CLIENT_PROXY_TIMEOUT_DISCONNECT OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT #define OSYNC_CLIENT_PROXY_TIMEOUT_GETCHANGES OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT #define OSYNC_CLIENT_PROXY_TIMEOUT_COMMIT OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT -#define OSYNC_CLIENT_PROXY_TIMEOUT_BATCHCOMMIT OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT #define OSYNC_CLIENT_PROXY_TIMEOUT_COMMITTEDALL OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT #define OSYNC_CLIENT_PROXY_TIMEOUT_SYNCDONE OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT #define OSYNC_CLIENT_PROXY_TIMEOUT_READ OSYNC_CLIENT_PROXY_TIMEOUT_DEFAULT Modified: trunk/opensync/engine/opensync_engine.h ============================================================================== --- trunk/opensync/engine/opensync_engine.h Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/engine/opensync_engine.h Wed Apr 8 17:01:53 2009 (r5559) @@ -260,8 +260,7 @@ * osync_error_has_error() will return TRUE once the abort got requested. * * FIXME: Currently aborting of the current synchronization is not yet perfect! It - * will not preempt already running commands. For example the batch_commit - * will not be preempted and the engine will abort after the batch_commit is done. + * will not preempt already running commands. * * TODO: Review XMPM Benq patches for abort hander. Is sigaction really sane way * to abort? It's very important that the plugins get called with the disconnect Modified: trunk/opensync/group/opensync_group.c ============================================================================== --- trunk/opensync/group/opensync_group.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/group/opensync_group.c Wed Apr 8 17:01:53 2009 (r5559) @@ -594,7 +594,7 @@ osync_free(path); - /* flush anchor db */ + /* flush state db */ path = osync_strdup_printf("%s%canchor.db", osync_member_get_configdir(member), G_DIR_SEPARATOR); if (!(db = osync_db_new(error))) goto error_and_free; Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/group/opensync_member.c Wed Apr 8 17:01:53 2009 (r5559) @@ -49,8 +49,6 @@ osync_objtype_sink_set_getchanges_timeout(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"commit")) { osync_objtype_sink_set_commit_timeout(sink, atoi(str)); - } else if (!xmlStrcmp(cur->name, (const xmlChar *)"batch_commit")) { - osync_objtype_sink_set_batchcommit_timeout(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"committed_all")) { osync_objtype_sink_set_committedall_timeout(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"sync_done")) { @@ -454,7 +452,6 @@ _osync_member_save_sink_add_timeout(node, "disconnect", osync_objtype_sink_get_disconnect_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "get_changes", osync_objtype_sink_get_getchanges_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "commit", osync_objtype_sink_get_commit_timeout(sink), error); - _osync_member_save_sink_add_timeout(node, "batch_commit", osync_objtype_sink_get_batchcommit_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "committed_all", osync_objtype_sink_get_committedall_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "sync_done", osync_objtype_sink_get_syncdone_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "read", osync_objtype_sink_get_read_timeout(sink), error); Modified: trunk/opensync/ipc/opensync_serializer.c ============================================================================== --- trunk/opensync/ipc/opensync_serializer.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/ipc/opensync_serializer.c Wed Apr 8 17:01:53 2009 (r5559) @@ -296,7 +296,6 @@ * timeout disconnect (int) * timeout get_changes (int) * timeout commit (int) - * timeout batch_commit (int) * timeout committed_all (int) * timeout sync_done (int) * timeout read (int) @@ -327,7 +326,6 @@ osync_message_write_int(message, osync_objtype_sink_get_getchanges_timeout(sink)); osync_message_write_int(message, osync_objtype_sink_get_commit_timeout(sink)); - osync_message_write_int(message, osync_objtype_sink_get_batchcommit_timeout(sink)); osync_message_write_int(message, osync_objtype_sink_get_committedall_timeout(sink)); osync_message_write_int(message, osync_objtype_sink_get_syncdone_timeout(sink)); @@ -364,7 +362,6 @@ * timeout disconnect (int) * timeout get_changes (int) * timeout commit (int) - * timeout batch_commit (int) * timeout committed_all (int) * timeout sync_done (int) * timeout read (int) @@ -417,9 +414,6 @@ osync_objtype_sink_set_commit_timeout(*sink, timeout); osync_message_read_int(message, &timeout); - osync_objtype_sink_set_batchcommit_timeout(*sink, timeout); - - osync_message_read_int(message, &timeout); osync_objtype_sink_set_committedall_timeout(*sink, timeout); osync_message_read_int(message, &timeout); Modified: trunk/opensync/plugin/opensync_objtype_sink.c ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/plugin/opensync_objtype_sink.c Wed Apr 8 17:01:53 2009 (r5559) @@ -389,28 +389,15 @@ functions = sink->functions; - if (functions.batch_commit) { - //Append to the stored changes - sink->commit_changes = osync_list_append(sink->commit_changes, change); - - /* Increment refcounting for batch_commit to avoid too early freeing of the context. - Otherwise the context would get freed after this function call. But the batch_commit - is collecting every contexts and changes and finally commits everything at once. */ - osync_context_ref(ctx); - sink->commit_contexts = osync_list_append(sink->commit_contexts, ctx); - osync_trace(TRACE_EXIT, "%s: Waiting for batch processing", __func__); + // Send the change + if (sink->objtype && !functions.commit) { + osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "No commit_change function was given"); + osync_trace(TRACE_EXIT_ERROR, "%s: No commit_change function was given", __func__); return; + } else if (!functions.commit) { + osync_context_report_success(ctx); } else { - // Send the change - if (sink->objtype && !functions.commit) { - osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, "No commit_change function was given"); - osync_trace(TRACE_EXIT_ERROR, "%s: No commit_change function was given", __func__); - return; - } else if (!functions.commit) { - osync_context_report_success(ctx); - } else { - functions.commit(sink, info, ctx, change, osync_objtype_sink_get_userdata(sink)); - } + functions.commit(sink, info, ctx, change, osync_objtype_sink_get_userdata(sink)); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -431,35 +418,7 @@ osync_assert(ctx); functions = sink->functions; - if (functions.batch_commit) { - OSyncChange **changes = osync_try_malloc0(sizeof(OSyncChange *) * (osync_list_length(sink->commit_changes) + 1), &error); - if (!changes) - goto error; - OSyncContext **contexts = osync_try_malloc0(sizeof(OSyncContext *) * (osync_list_length(sink->commit_contexts) + 1), &error); - if (!contexts) - goto error; - - o = sink->commit_contexts; - c = NULL; - for (c = sink->commit_changes; c && o; c = c->next) { - change = c->data; - context = o->data; - - changes[i] = change; - contexts[i] = context; - - i++; - o = o->next; - } - - osync_list_free(sink->commit_changes); - osync_list_free(sink->commit_contexts); - - functions.batch_commit(sink, info, ctx, contexts, changes, osync_objtype_sink_get_userdata(sink)); - - osync_free(changes); - osync_free(contexts); - } else if (functions.committed_all) { + if (functions.committed_all) { functions.committed_all(sink, info, ctx, osync_objtype_sink_get_userdata(sink)); } else { osync_context_report_success(ctx); @@ -618,24 +577,6 @@ return sink->timeout.commit; } -void osync_objtype_sink_set_batchcommit_timeout(OSyncObjTypeSink *sink, unsigned int timeout) -{ - osync_assert(sink); - sink->timeout.batch_commit = timeout; -} - -unsigned int osync_objtype_sink_get_batchcommit_timeout_or_default(OSyncObjTypeSink *sink) -{ - osync_assert(sink); - return sink->timeout.batch_commit ? sink->timeout.batch_commit : OSYNC_SINK_TIMEOUT_BATCHCOMMIT; -} - -unsigned int osync_objtype_sink_get_batchcommit_timeout(OSyncObjTypeSink *sink) -{ - osync_assert(sink); - return sink->timeout.batch_commit; -} - void osync_objtype_sink_set_committedall_timeout(OSyncObjTypeSink *sink, unsigned int timeout) { osync_assert(sink); @@ -835,12 +776,6 @@ sink->func_read = TRUE; } -void osync_objtype_sink_set_batch_commit_func(OSyncObjTypeSink *sink, OSyncSinkBatchCommitFn batch_commit_func) -{ - osync_return_if_fail(sink); - sink->functions.batch_commit = batch_commit_func; -} - void osync_objtype_sink_set_sync_done_func(OSyncObjTypeSink *sink, OSyncSinkSyncDoneFn sync_done_func) { osync_return_if_fail(sink); Modified: trunk/opensync/plugin/opensync_objtype_sink.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.h Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/plugin/opensync_objtype_sink.h Wed Apr 8 17:01:53 2009 (r5559) @@ -36,7 +36,6 @@ typedef osync_bool (* OSyncSinkWriteFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data); typedef void (* OSyncSinkCommittedAllFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data); typedef osync_bool (* OSyncSinkReadFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data); -typedef void (* OSyncSinkBatchCommitFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **, OSyncChange **changes, void *data); typedef void (* OSyncSinkSyncDoneFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data); typedef void (* OSyncSinkConnectDoneFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data); @@ -385,8 +384,7 @@ /** @brief Tells the sink that all changes have been committed * - * Calls the committed_all function on a sink or the batch_commit function - * depending on which function the sink wants to use. + * Calls the committed_all function on a sink. * * @param sink Pointer to the sink * @param info Pointer to the plugin info object @@ -428,14 +426,6 @@ */ OSYNC_EXPORT void osync_objtype_sink_set_commit_timeout(OSyncObjTypeSink *sink, unsigned int timeout); -/** @brief Sets the batchcommit timeout in seconds for the OSyncObjTypeSink - * - * @param sink Pointer to the sink - * @param timeout The timeout in seconds - * - */ -OSYNC_EXPORT void osync_objtype_sink_set_batchcommit_timeout(OSyncObjTypeSink *sink, unsigned int timeout); - /** @brief Sets the committedall timeout in seconds for the OSyncObjTypeSink * * @param sink Pointer to the sink @@ -511,8 +501,6 @@ OSYNC_EXPORT void osync_objtype_sink_set_read_func(OSyncObjTypeSink *sink, OSyncSinkReadFn read_func); -OSYNC_EXPORT void osync_objtype_sink_set_batch_commit_func(OSyncObjTypeSink *sink, OSyncSinkBatchCommitFn batch_commit_func); - OSYNC_EXPORT void osync_objtype_sink_set_sync_done_func(OSyncObjTypeSink *sink, OSyncSinkSyncDoneFn sync_done_func); OSYNC_EXPORT void osync_objtype_sink_set_connect_done_func(OSyncObjTypeSink *sink, OSyncSinkConnectDoneFn connect_done_func); Modified: trunk/opensync/plugin/opensync_objtype_sink_internals.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink_internals.h Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/plugin/opensync_objtype_sink_internals.h Wed Apr 8 17:01:53 2009 (r5559) @@ -39,7 +39,6 @@ OSyncSinkCommitFn commit; OSyncSinkCommittedAllFn committed_all; OSyncSinkReadFn read; - OSyncSinkBatchCommitFn batch_commit; OSyncSinkSyncDoneFn sync_done; OSyncSinkConnectDoneFn connect_done; } OSyncObjTypeSinkFunctions; @@ -179,24 +178,6 @@ */ unsigned int osync_objtype_sink_get_commit_timeout(OSyncObjTypeSink *sink); - -/** @brief Get the current or default batchcommit timeout in seconds - * - * @param sink Pointer to the sink - * @return The timeout in seconds - * - */ -unsigned int osync_objtype_sink_get_batchcommit_timeout_or_default(OSyncObjTypeSink *sink); - -/** @brief Get the current batchcommit timeout in seconds - * - * @param sink Pointer to the sink - * @return The timeout in seconds - * - */ -unsigned int osync_objtype_sink_get_batchcommit_timeout(OSyncObjTypeSink *sink); - - /** @brief Get the current or default committedall timeout in seconds * * @param sink Pointer to the sink Modified: trunk/opensync/plugin/opensync_objtype_sink_private.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink_private.h Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/opensync/plugin/opensync_objtype_sink_private.h Wed Apr 8 17:01:53 2009 (r5559) @@ -55,7 +55,6 @@ #define OSYNC_SINK_TIMEOUT_DISCONNECT OSYNC_SINK_TIMEOUT_TRANSPORT #define OSYNC_SINK_TIMEOUT_GETCHANGES OSYNC_SINK_TIMEOUT_BATCHIO #define OSYNC_SINK_TIMEOUT_COMMIT OSYNC_SINK_TIMEOUT_BATCHIO /* FIXME */ -#define OSYNC_SINK_TIMEOUT_BATCHCOMMIT OSYNC_SINK_TIMEOUT_BATCHIO #define OSYNC_SINK_TIMEOUT_COMMITTEDALL OSYNC_SINK_TIMEOUT_SINGLEIO #define OSYNC_SINK_TIMEOUT_SYNCDONE OSYNC_SINK_TIMEOUT_SINGLEIO #define OSYNC_SINK_TIMEOUT_READ OSYNC_SINK_TIMEOUT_BATCHIO /* FIXME */ @@ -66,7 +65,6 @@ unsigned int disconnect; unsigned int get_changes; unsigned int commit; - unsigned int batch_commit; unsigned int committed_all; unsigned int sync_done; unsigned int read; @@ -122,9 +120,6 @@ /** Referce counting */ int ref_count; - /** List to pile up changes for batch commit */ - OSyncList *commit_changes; - OSyncList *commit_contexts; osync_bool available; }; Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/tests/engine-tests/check_engine_error.c Wed Apr 8 17:01:53 2009 (r5559) @@ -2117,6 +2117,8 @@ } END_TEST +/* batch_commit no longer exists + START_TEST (engine_error_committed_all_batch_error) { char *testbed = setup_testbed("multisync_easy_new"); @@ -2178,6 +2180,7 @@ destroy_testbed(testbed); } END_TEST +*/ START_TEST (engine_error_single_sync_done_error) { @@ -3097,7 +3100,6 @@ OSYNC_TESTCASE_ADD(engine_error_commit_error_delete) OSYNC_TESTCASE_ADD(engine_error_committed_all_error) -OSYNC_TESTCASE_ADD(engine_error_committed_all_batch_error) OSYNC_TESTCASE_ADD(engine_error_single_sync_done_error) OSYNC_TESTCASE_ADD(engine_error_dual_sync_done_error) Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/tests/mock-plugin/mock_sync.c Wed Apr 8 17:01:53 2009 (r5559) @@ -488,49 +488,6 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_batch_commit(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *context, OSyncContext **contexts, OSyncChange **changes, void *data) -{ - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, sink, info, context, contexts, changes, data); - MockDir *dir = data; - OSyncHashTable *hashtable = osync_objtype_sink_get_hashtable(sink); - - osync_assert(dir->committed_all == FALSE); - dir->committed_all = TRUE; - - int i; - for (i = 0; contexts[i]; i++) { - if (mock_write(sink, info, contexts[i], changes[i], data)) { - char *filename = g_strdup_printf ("%s/%s", dir->path, osync_change_get_uid(changes[i])); - char *hash = NULL; - - if (osync_change_get_changetype(changes[i]) != OSYNC_CHANGE_TYPE_DELETED) { - struct stat buf; - stat(filename, &buf); - hash = mock_generate_hash(&buf); - osync_change_set_hash(changes[i], hash); - } - g_free(filename); - - osync_hashtable_update_change(hashtable, changes[i]); - osync_context_report_success(contexts[i]); - } - } - - if (g_getenv("NUM_BATCH_COMMITS")) { - int req = atoi(g_getenv("NUM_BATCH_COMMITS")); - osync_assert(req == i); - } - - if (mock_get_error(info->memberid, "COMMITTED_ALL_ERROR")) { - osync_context_report_error(context, OSYNC_ERROR_EXPECTED, "Triggering COMMITTED_ALL_ERROR error"); - return; - } - - osync_context_report_success(context); - - osync_trace(TRACE_EXIT, "%s", __func__); -} - static void mock_committed_all(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *context, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, context, data); @@ -656,14 +613,8 @@ osync_objtype_sink_set_get_changes_func(sink, mock_get_changes); - //Rewrite the batch commit functions so we can enable them if necessary - if (mock_get_error(info->memberid, "BATCH_COMMIT")) { - osync_trace(TRACE_INTERNAL, "Enabling batch_commit on %p:%s", sink, osync_objtype_sink_get_name(sink) ? osync_objtype_sink_get_name(sink) : "None"); - osync_objtype_sink_set_batch_commit_func(sink, mock_batch_commit); - } else { - osync_objtype_sink_set_committed_all_func(sink, mock_committed_all); - osync_objtype_sink_set_commit_func(sink, mock_commit_change); - } + osync_objtype_sink_set_committed_all_func(sink, mock_committed_all); + osync_objtype_sink_set_commit_func(sink, mock_commit_change); osync_objtype_sink_set_read_func(sink, mock_read); osync_objtype_sink_set_sync_done_func(sink, mock_sync_done); @@ -682,7 +633,6 @@ osync_objtype_sink_set_getchanges_timeout(sink, 2); osync_objtype_sink_set_commit_timeout(sink, 4); osync_objtype_sink_set_committedall_timeout(sink, 4); - osync_objtype_sink_set_batchcommit_timeout(sink, 4); osync_objtype_sink_set_syncdone_timeout(sink, 2); osync_objtype_sink_set_disconnect_timeout(sink, 2); @@ -706,7 +656,6 @@ osync_objtype_sink_set_getchanges_timeout(sink, 0); osync_objtype_sink_set_commit_timeout(sink, 0); osync_objtype_sink_set_committedall_timeout(sink, 0); - osync_objtype_sink_set_batchcommit_timeout(sink, 0); osync_objtype_sink_set_syncdone_timeout(sink, 0); osync_objtype_sink_set_disconnect_timeout(sink, 0); Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/tests/support.c Wed Apr 8 17:01:53 2009 (r5559) @@ -72,7 +72,6 @@ g_unsetenv("SYNC_DONE_TIMEOUT"); g_unsetenv("DISCONNECT_ERROR"); g_unsetenv("DISCONNECT_TIMEOUT"); - g_unsetenv("BATCH_COMMIT"); g_unsetenv("COMMITTED_ALL_ERROR"); g_unsetenv("NO_COMMITTED_ALL_CHECK"); g_unsetenv("MAINSINK_CONNECT"); Modified: trunk/tests/sync-tests/check_multisync.c ============================================================================== --- trunk/tests/sync-tests/check_multisync.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/tests/sync-tests/check_multisync.c Wed Apr 8 17:01:53 2009 (r5559) @@ -1942,6 +1942,8 @@ } END_TEST +/* batch_commit is no longer supported + START_TEST(multisync_easy_new_b) { char *testbed = setup_testbed("multisync_easy_new"); @@ -1950,6 +1952,9 @@ destroy_testbed(testbed); } END_TEST +*/ + +/* batch_commit is no longer supported START_TEST(multisync_triple_del_b) { @@ -1959,6 +1964,9 @@ destroy_testbed(testbed); } END_TEST +*/ + +/* batch_commit is no longer supported START_TEST(multisync_conflict_hybrid_choose2_b) { @@ -1968,6 +1976,9 @@ destroy_testbed(testbed); } END_TEST +*/ + +/* batch_commit is no longer supported START_TEST(multisync_delayed_conflict_handler_b) { @@ -1977,6 +1988,9 @@ destroy_testbed(testbed); } END_TEST +*/ + +/* batch_commit is no longer supported START_TEST(multisync_delayed_slow_b) { @@ -1986,6 +2000,10 @@ destroy_testbed(testbed); } END_TEST +*/ + +/* batch_commit is no longer supported + #if 0 START_TEST(multisync_conflict_ignore_b) { @@ -2013,7 +2031,7 @@ } END_TEST -START_TEST(multisync_multi_conflict_b) +/* batch_commit is no longer supported { setenv("BATCH_COMMIT", "7", TRUE); multisync_multi_conflict(); @@ -2021,7 +2039,6 @@ } END_TEST - START_TEST(multisync_zero_changes_b) { setenv("BATCH_COMMIT", "7", TRUE); @@ -2138,6 +2155,7 @@ } END_TEST #endif +*/ OSYNC_TESTCASE_START("multisync") OSYNC_TESTCASE_ADD(multisync_easy_new) @@ -2181,6 +2199,8 @@ OSYNC_TESTCASE_ADD(multisync_conflict_ignore) OSYNC_TESTCASE_ADD(multisync_conflict_ignore2) +/* batch_commit is no longer supported + OSYNC_TESTCASE_ADD(multisync_easy_new_b) OSYNC_TESTCASE_ADD(multisync_triple_del_b) OSYNC_TESTCASE_ADD(multisync_conflict_hybrid_choose2_b) @@ -2198,6 +2218,7 @@ OSYNC_TESTCASE_ADD(multisync_conflict_ignore_b2) OSYNC_TESTCASE_ADD(multisync_multi_conflict_b2) #endif +*/ OSYNC_TESTCASE_END Modified: trunk/tools/osyncplugin.c ============================================================================== --- trunk/tools/osyncplugin.c Tue Apr 7 22:25:59 2009 (r5558) +++ trunk/tools/osyncplugin.c Wed Apr 8 17:01:53 2009 (r5559) @@ -62,7 +62,6 @@ CMD_SLOWSYNC, CMD_FASTSYNC, CMD_COMMIT, - CMD_BATCHCOMMIT, CMD_COMMITTEDALL, CMD_READ, CMD_WRITE, @@ -152,7 +151,6 @@ fprintf (stderr, "[--syncdone] \t\n"); fprintf (stderr, "[--committedall] \t\n"); fprintf (stderr, "[--commit] \t\n"); - fprintf (stderr, "[--batchcommit] \t\n"); fprintf (stderr, "[--write] \t\n"); fprintf (stderr, "[--read] \t\n"); fprintf (stderr, "[--empty] \t\n"); @@ -271,13 +269,6 @@ new_command(CMD_COMMIT, argv[++i]); continue; - } else if (!strcmp(arg, "--batchcommit")) { - if (!argv[i+1] || *argv[i+1] == '-') - new_command(CMD_BATCHCOMMIT, NULL); - else - new_command(CMD_BATCHCOMMIT, argv[++i]); - - continue; } else if (!strcmp(arg, "--write")) { if (!argv[i+1] || *argv[i+1] == '-') new_command(CMD_WRITE, NULL); @@ -1212,9 +1203,6 @@ case CMD_COMMIT: fprintf(stderr, "COMMIT not yet implemented\n"); break; - case CMD_BATCHCOMMIT: - fprintf(stderr, "BATCHCOMMIT not yet implemented\n"); - break; case CMD_COMMITTEDALL: if (!committedall(cmd, error)) goto error; @@ -1249,7 +1237,6 @@ case CMD_FASTSYNC: case CMD_SYNC: case CMD_COMMIT: - case CMD_BATCHCOMMIT: case CMD_COMMITTEDALL: case CMD_READ: case CMD_WRITE: |
