Menu
▾
▴
[Opensync-commits] r5158 - in trunk: opensync/plugin tests/engine-tests tests/mock-plugin
|
From: <dg...@su...> - 2009-01-16 08:19:05
|
Author: bricks Date: Fri Jan 16 09:18:04 2009 New Revision: 5158 URL: http://www.opensync.org/changeset/5158 Log: Changed Plugin-Sink Function parameter list #1018 Modified: trunk/opensync/plugin/opensync_objtype_sink.c trunk/opensync/plugin/opensync_objtype_sink.h trunk/tests/engine-tests/check_engine.c trunk/tests/engine-tests/check_engine_error.c trunk/tests/mock-plugin/mock_sync.c Modified: trunk/opensync/plugin/opensync_objtype_sink.c ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.c Fri Jan 16 00:52:33 2009 (r5157) +++ trunk/opensync/plugin/opensync_objtype_sink.c Fri Jan 16 09:18:04 2009 (r5158) @@ -272,7 +272,7 @@ } else if (!functions.get_changes) { osync_context_report_success(ctx); } else { - functions.get_changes(plugindata, info, ctx); + functions.get_changes(sink, info, ctx, osync_objtype_sink_get_slowsync(sink), plugindata); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -296,7 +296,7 @@ } else if (!functions.read) { osync_context_report_success(ctx); } else { - functions.read(plugindata, info, ctx, change); + functions.read(sink, info, ctx, change, plugindata); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -313,7 +313,7 @@ if (!functions.connect) { osync_context_report_success(ctx); } else { - functions.connect(plugindata, info, ctx); + functions.connect(sink, info, ctx, plugindata); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -330,7 +330,7 @@ if (!functions.disconnect) { osync_context_report_success(ctx); } else { - functions.disconnect(plugindata, info, ctx); + functions.disconnect(sink, info, ctx, plugindata); } osync_trace(TRACE_EXIT, "%s", __func__); @@ -347,7 +347,7 @@ if (!functions.sync_done) osync_context_report_success(ctx); else - functions.sync_done(plugindata, info, ctx); + functions.sync_done(sink, info, ctx, plugindata); osync_trace(TRACE_EXIT, "%s", __func__); } @@ -363,7 +363,7 @@ if (!functions.connect_done) osync_context_report_success(ctx); else - functions.connect_done(plugindata, info, ctx); + functions.connect_done(sink, info, ctx, plugindata); osync_trace(TRACE_EXIT, "%s", __func__); } @@ -398,7 +398,7 @@ } else if (!functions.commit) { osync_context_report_success(ctx); } else { - functions.commit(plugindata, info, ctx, change); + functions.commit(sink, info, ctx, change, plugindata); } } @@ -444,12 +444,12 @@ osync_list_free(sink->commit_changes); osync_list_free(sink->commit_contexts); - functions.batch_commit(plugindata, info, ctx, contexts, changes); + functions.batch_commit(sink, info, ctx, contexts, changes, plugindata); osync_free(changes); osync_free(contexts); } else if (functions.committed_all) { - functions.committed_all(plugindata, info, ctx); + functions.committed_all(sink, info, ctx, plugindata); } else { osync_context_report_success(ctx); } Modified: trunk/opensync/plugin/opensync_objtype_sink.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.h Fri Jan 16 00:52:33 2009 (r5157) +++ trunk/opensync/plugin/opensync_objtype_sink.h Fri Jan 16 09:18:04 2009 (r5158) @@ -29,16 +29,16 @@ */ /*@{*/ -typedef void (* OSyncSinkConnectFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -typedef void (* OSyncSinkDisconnectFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -typedef void (* OSyncSinkGetChangesFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -typedef void (* OSyncSinkCommitFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -typedef osync_bool (* OSyncSinkWriteFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -typedef void (* OSyncSinkCommittedAllFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -typedef osync_bool (* OSyncSinkReadFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change); -typedef void (* OSyncSinkBatchCommitFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncContext **, OSyncChange **changes); -typedef void (* OSyncSinkSyncDoneFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -typedef void (* OSyncSinkConnectDoneFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); +typedef void (* OSyncSinkConnectFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data); +typedef void (* OSyncSinkDisconnectFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data); +typedef void (* OSyncSinkGetChangesFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data); +typedef void (* OSyncSinkCommitFn) (OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data); +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, void *data); typedef struct OSyncObjTypeSinkFunctions { OSyncSinkConnectFn connect; Modified: trunk/tests/engine-tests/check_engine.c ============================================================================== --- trunk/tests/engine-tests/check_engine.c Fri Jan 16 00:52:33 2009 (r5157) +++ trunk/tests/engine-tests/check_engine.c Fri Jan 16 09:18:04 2009 (r5158) @@ -134,7 +134,7 @@ } END_TEST -static void connect1(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect1(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -153,7 +153,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -172,7 +172,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -364,7 +364,7 @@ } END_TEST -static void connect2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -383,7 +383,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void disconnect2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void disconnect2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -402,7 +402,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void get_changes2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -421,7 +421,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_connect2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_connect2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -440,7 +440,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_disconnect2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_disconnect2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -459,7 +459,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_get_changes2(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_get_changes2(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -679,7 +679,7 @@ } END_TEST -static void connect3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -699,7 +699,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void disconnect3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void disconnect3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -721,7 +721,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void get_changes3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -741,7 +741,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void sync_done3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void sync_done3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -763,7 +763,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_connect3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_connect3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -789,7 +789,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_disconnect3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_disconnect3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -817,7 +817,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_get_changes3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_get_changes3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -844,7 +844,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void main_sync_done3(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_sync_done3(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -1080,7 +1080,7 @@ } END_TEST -static void main_disconnect4(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void main_disconnect4(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -1359,7 +1359,7 @@ } END_TEST -static void connect5(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect5(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -1371,7 +1371,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void disconnect5(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void disconnect5(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -1383,7 +1383,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void get_changes5(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes5(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -1430,7 +1430,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void commit_change5(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static void commit_change5(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { mock_env *env = data; osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); @@ -1594,7 +1594,7 @@ } END_TEST -static void get_changes6(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes6(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; int i; @@ -1798,7 +1798,7 @@ } END_TEST -static void get_changes7(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes7(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { mock_env *env = data; int i; Modified: trunk/tests/engine-tests/check_engine_error.c ============================================================================== --- trunk/tests/engine-tests/check_engine_error.c Fri Jan 16 00:52:33 2009 (r5157) +++ trunk/tests/engine-tests/check_engine_error.c Fri Jan 16 09:18:04 2009 (r5158) @@ -33,7 +33,7 @@ int num_disconnect = 0; int num_get_changes = 0; -static void connect1(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect1(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -44,7 +44,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void connect_error(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void connect_error(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -55,7 +55,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); @@ -66,7 +66,7 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Fri Jan 16 00:52:33 2009 (r5157) +++ trunk/tests/mock-plugin/mock_sync.c Fri Jan 16 09:18:04 2009 (r5158) @@ -25,24 +25,24 @@ static osync_bool mock_get_error(long long int memberid, const char *domain) { - const char *env = g_getenv(domain); + const char *env = g_getenv(domain); - if (!env) - return FALSE; + if (!env) + return FALSE; - int num = atoi(env); - int mask = 1 << (memberid - 1); - if (num & mask) { - char *chancestr = g_strdup_printf("%s_PROB", domain); - const char *chance = g_getenv(chancestr); - g_free(chancestr); - if (!chance) - return TRUE; - int prob = atoi(chance); - if (prob >= g_random_int_range(0, 100)) - return TRUE; - } - return FALSE; + int num = atoi(env); + int mask = 1 << (memberid - 1); + if (num & mask) { + char *chancestr = g_strdup_printf("%s_PROB", domain); + const char *chance = g_getenv(chancestr); + g_free(chancestr); + if (!chance) + return TRUE; + int prob = atoi(chance); + if (prob >= g_random_int_range(0, 100)) + return TRUE; + } + return FALSE; } static char *mock_generate_hash(struct stat *buf) @@ -50,14 +50,13 @@ return g_strdup_printf("%i-%i", (int)buf->st_mtime, (int)buf->st_ctime); } -static void mock_connect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void mock_connect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { osync_bool anchor_compare_match; - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); MockDir *dir = osync_objtype_sink_get_userdata(sink); - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); if (mock_get_error(info->memberid, "CONNECT_ERROR")) { osync_context_report_error(ctx, OSYNC_ERROR_EXPECTED, "Triggering CONNECT_ERROR error"); @@ -102,10 +101,9 @@ return; } -static void mock_connect_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void mock_connect_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); if (mock_get_error(info->memberid, "CONNECT_DONE_ERROR")) { @@ -130,11 +128,10 @@ } -static void mock_disconnect(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void mock_disconnect(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); MockDir *dir = osync_objtype_sink_get_userdata(sink); mock_env *env = data; @@ -172,10 +169,9 @@ //typedef void (* OSyncSinkCommittedAllFn) (void *data, OSyncPluginInfo *info, OSyncContext *ctx); -static osync_bool mock_read(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static osync_bool mock_read(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); OSyncError *error = NULL; @@ -211,10 +207,9 @@ return TRUE; } -static osync_bool mock_write(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static osync_bool mock_write(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, data, info, ctx, change); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); OSyncError *error = NULL; OSyncData *odata = NULL; @@ -366,10 +361,9 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_get_changes(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void mock_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, osync_bool slow_sync, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %i, %p)", __func__, sink, info, ctx, slow_sync, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); OSyncError *error = NULL; @@ -430,10 +424,9 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_commit_change(void *data, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change) +static void mock_commit_change(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *change, void *data) { - osync_trace(TRACE_ENTRY, "%s", __func__); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, sink, info, ctx, change, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); char *filename = NULL; @@ -449,7 +442,7 @@ return; } - if (!mock_write(data, info, ctx, change)) { + if (!mock_write(sink, info, ctx, change, data)) { osync_trace(TRACE_EXIT_ERROR, "%s", __func__); return; } @@ -474,18 +467,17 @@ osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_batch_commit(void *data, OSyncPluginInfo *info, OSyncContext *context, OSyncContext **contexts, OSyncChange **changes) +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)", __func__, context, contexts, changes); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p, %p)", __func__, sink, info, context, contexts, changes, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); - osync_assert(dir->committed_all == FALSE); - dir->committed_all = TRUE; + osync_assert(dir->committed_all == FALSE); + dir->committed_all = TRUE; - int i; - for (i = 0; contexts[i]; i++) { - if (mock_write(data, info, contexts[i], changes[i])) { + 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; @@ -498,49 +490,47 @@ g_free(filename); osync_hashtable_update_change(dir->hashtable, changes[i]); - osync_context_report_success(contexts[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; - } + 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_context_report_success(context); - osync_trace(TRACE_EXIT, "%s", __func__); + osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_committed_all(void *data, OSyncPluginInfo *info, OSyncContext *context) +static void mock_committed_all(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *context, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p)", __func__, context); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, context, data); MockDir *dir = osync_objtype_sink_get_userdata(sink); - osync_assert(dir->committed_all == FALSE); - dir->committed_all = TRUE; + osync_assert(dir->committed_all == FALSE); + dir->committed_all = TRUE; - if (mock_get_error(info->memberid, "COMMITTED_ALL_ERROR")) { - osync_context_report_error(context, OSYNC_ERROR_EXPECTED, "Triggering COMMITTED_ALL_ERROR error"); - osync_trace(TRACE_EXIT_ERROR, "%s: Reporting error", __func__); - return; - } + if (mock_get_error(info->memberid, "COMMITTED_ALL_ERROR")) { + osync_context_report_error(context, OSYNC_ERROR_EXPECTED, "Triggering COMMITTED_ALL_ERROR error"); + osync_trace(TRACE_EXIT_ERROR, "%s: Reporting error", __func__); + return; + } - osync_context_report_success(context); + osync_context_report_success(context); - osync_trace(TRACE_EXIT, "%s", __func__); + osync_trace(TRACE_EXIT, "%s", __func__); } -static void mock_sync_done(void *data, OSyncPluginInfo *info, OSyncContext *ctx) +static void mock_sync_done(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx, void *data) { - osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, data, info, ctx); - OSyncObjTypeSink *sink = osync_plugin_info_get_sink(info); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, sink, info, ctx, data); OSyncAnchor *anchor = osync_objtype_sink_get_anchor(sink); MockDir *dir = osync_objtype_sink_get_userdata(sink); @@ -563,7 +553,7 @@ * all _possible_ objtype sinks. */ static void *mock_initialize(OSyncPlugin *plugin, OSyncPluginInfo *info, OSyncError **error) { - osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, info, error); + osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, plugin, info, error); if (mock_get_error(info->memberid, "INIT_NULL_NOERROR")) { osync_trace(TRACE_EXIT, "%s: %s", __func__, "Everything is fine. I don't need plugin userdata."); |
