Menu
▾
▴
[Opensync-commits] r5435 - in trunk: . opensync/group opensync/ipc opensync/plugin tests/mock-plugin
|
From: <svn...@op...> - 2009-03-29 22:16:33
|
Author: dgollub Date: Mon Mar 30 00:16:21 2009 New Revision: 5435 URL: http://www.opensync.org/changeset/5435 Log: Drop Sink Plugin function "write" (don't mixup with "commit"!). This plugin function was never used inside the engine and just causes confusion. Currently there is also no need for a "sync framework" to do "single writes" out of sync order. Modified: trunk/opensync.sym 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/mock-plugin/mock_sync.c Modified: trunk/opensync.sym ============================================================================== --- trunk/opensync.sym Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync.sym Mon Mar 30 00:16:21 2009 (r5435) @@ -417,8 +417,6 @@ osync_objtype_sink_set_syncdone_timeout osync_objtype_sink_set_userdata osync_objtype_sink_set_write -osync_objtype_sink_set_write_func -osync_objtype_sink_set_write_timeout osync_objtype_sink_sync_done osync_objtype_sink_unref osync_plugin_advancedoption_add_parameter Modified: trunk/opensync/group/opensync_member.c ============================================================================== --- trunk/opensync/group/opensync_member.c Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/group/opensync_member.c Mon Mar 30 00:16:21 2009 (r5435) @@ -55,8 +55,6 @@ osync_objtype_sink_set_committedall_timeout(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"sync_done")) { osync_objtype_sink_set_syncdone_timeout(sink, atoi(str)); - } else if (!xmlStrcmp(cur->name, (const xmlChar *)"write")) { - osync_objtype_sink_set_write_timeout(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"read")) { osync_objtype_sink_set_read_timeout(sink, atoi(str)); } @@ -90,8 +88,6 @@ osync_objtype_sink_set_read(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"getchanges")) { osync_objtype_sink_set_getchanges(sink, atoi(str)); - } else if (!xmlStrcmp(cur->name, (const xmlChar *)"write")) { - osync_objtype_sink_set_write(sink, atoi(str)); } else if (!xmlStrcmp(cur->name, (const xmlChar *)"objformat")) { xmlChar *str_name = osync_xml_find_node(cur, "name"); xmlChar *str_config = osync_xml_find_node(cur, "config"); @@ -461,7 +457,6 @@ _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, "write", osync_objtype_sink_get_write_timeout(sink), error); _osync_member_save_sink_add_timeout(node, "read", osync_objtype_sink_get_read_timeout(sink), error); if (!node->children) { @@ -488,7 +483,6 @@ xmlNewChild(node, NULL, (xmlChar*)"enabled", osync_objtype_sink_is_enabled(sink) ? (xmlChar*)"1" : (xmlChar*)"0"); xmlNewChild(node, NULL, (xmlChar*)"read", osync_objtype_sink_get_read(sink) ? (xmlChar*)"1" : (xmlChar*)"0"); xmlNewChild(node, NULL, (xmlChar*)"getchanges", osync_objtype_sink_get_getchanges(sink) ? (xmlChar*)"1" : (xmlChar*)"0"); - xmlNewChild(node, NULL, (xmlChar*)"write", osync_objtype_sink_get_write(sink) ? (xmlChar*)"1" : (xmlChar*)"0"); /* Check if sink is a Main Sink, if so skip objtype specific stuff */ if (sink && !osync_objtype_sink_get_name(sink)) Modified: trunk/opensync/ipc/opensync_serializer.c ============================================================================== --- trunk/opensync/ipc/opensync_serializer.c Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/ipc/opensync_serializer.c Mon Mar 30 00:16:21 2009 (r5435) @@ -288,7 +288,6 @@ * name * read function (bool) * get_changes function (bool) - * write function (bool) * preferred_format (string) * number of format sinks * format sink list (format sinks) @@ -301,7 +300,6 @@ * timeout committed_all (int) * timeout sync_done (int) * timeout read (int) - * timeout write (int) * */ @@ -310,7 +308,6 @@ osync_message_write_int(message, osync_objtype_sink_get_function_read(sink)); osync_message_write_int(message, osync_objtype_sink_get_function_getchanges(sink)); - osync_message_write_int(message, osync_objtype_sink_get_function_write(sink)); osync_message_write_string(message, osync_objtype_sink_get_preferred_format(sink)); @@ -335,7 +332,6 @@ osync_message_write_int(message, osync_objtype_sink_get_syncdone_timeout(sink)); osync_message_write_int(message, osync_objtype_sink_get_read_timeout(sink)); - osync_message_write_int(message, osync_objtype_sink_get_write_timeout(sink)); return TRUE; @@ -350,7 +346,7 @@ char *preferred_format = NULL; int num_formats = 0; int enabled = 0, timeout = 0; - int read = 0, get_changes = 0, write = 0; + int read = 0, get_changes = 0; int i = 0; osync_assert(message); @@ -360,7 +356,6 @@ * name * read function (bool) * get_changes function (bool) - * write function (bool) * preferred_format (string) * number of format sinks * format sink list (format sinks) @@ -373,7 +368,6 @@ * timeout committed_all (int) * timeout sync_done (int) * timeout read (int) - * timeout write (int) * */ @@ -391,9 +385,6 @@ osync_message_read_int(message, &get_changes); osync_objtype_sink_set_function_getchanges(*sink, get_changes); - osync_message_read_int(message, &write); - osync_objtype_sink_set_function_write(*sink, write); - osync_message_read_string(message, &preferred_format); osync_objtype_sink_set_preferred_format(*sink, preferred_format); osync_free(preferred_format); @@ -437,9 +428,6 @@ osync_message_read_int(message, &timeout); osync_objtype_sink_set_read_timeout(*sink, timeout); - osync_message_read_int(message, &timeout); - osync_objtype_sink_set_write_timeout(*sink, timeout); - return TRUE; error: Modified: trunk/opensync/plugin/opensync_objtype_sink.c ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.c Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/plugin/opensync_objtype_sink.c Mon Mar 30 00:16:21 2009 (r5435) @@ -256,22 +256,16 @@ sink->func_getchanges = getchanges; } -osync_bool osync_objtype_sink_get_function_write(OSyncObjTypeSink *sink) -{ - osync_assert(sink); - return sink->func_write; -} - -void osync_objtype_sink_set_function_write(OSyncObjTypeSink *sink, osync_bool write) +void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink) { osync_assert(sink); - sink->func_write = write; + return sink->userdata; } -void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink) +void osync_objtype_sink_set_userdata(OSyncObjTypeSink *sink, void *userdata) { - osync_assert(sink); - return sink->userdata; + osync_return_if_fail(sink); + sink->userdata = userdata; } void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, OSyncPluginInfo *info, OSyncContext *ctx) @@ -696,24 +690,6 @@ return sink->timeout.connect_done; } -void osync_objtype_sink_set_write_timeout(OSyncObjTypeSink *sink, unsigned int timeout) -{ - osync_assert(sink); - sink->timeout.write = timeout; -} - -unsigned int osync_objtype_sink_get_write_timeout_or_default(OSyncObjTypeSink *sink) -{ - osync_assert(sink); - return sink->timeout.write ? sink->timeout.write : OSYNC_SINK_TIMEOUT_WRITE; -} - -unsigned int osync_objtype_sink_get_write_timeout(OSyncObjTypeSink *sink) -{ - osync_assert(sink); - return sink->timeout.write; -} - void osync_objtype_sink_set_read_timeout(OSyncObjTypeSink *sink, unsigned int timeout) { osync_assert(sink); @@ -817,12 +793,6 @@ return FALSE; } -void osync_objtype_sink_set_userdata(OSyncObjTypeSink *sink, void *userdata) -{ - osync_return_if_fail(sink); - sink->userdata = userdata; -} - void osync_objtype_sink_set_connect_func(OSyncObjTypeSink *sink, OSyncSinkConnectFn connect_func) { osync_return_if_fail(sink); @@ -850,15 +820,6 @@ sink->functions.commit = commit_func; } -void osync_objtype_sink_set_write_func(OSyncObjTypeSink *sink, OSyncSinkWriteFn write_func) -{ - osync_return_if_fail(sink); - sink->functions.write = write_func; - - if (sink->functions.write) - sink->func_write = TRUE; -} - void osync_objtype_sink_set_committed_all_func(OSyncObjTypeSink *sink, OSyncSinkCommittedAllFn committed_all_func) { osync_return_if_fail(sink); Modified: trunk/opensync/plugin/opensync_objtype_sink.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink.h Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/plugin/opensync_objtype_sink.h Mon Mar 30 00:16:21 2009 (r5435) @@ -465,14 +465,6 @@ */ OSYNC_EXPORT void osync_objtype_sink_set_syncdone_timeout(OSyncObjTypeSink *sink, unsigned int timeout); -/** @brief Sets the write 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_write_timeout(OSyncObjTypeSink *sink, unsigned int timeout); - /** @brief Sets the read timeout in seconds for the OSyncObjTypeSink * * @param sink Pointer to the sink @@ -530,8 +522,6 @@ OSYNC_EXPORT void osync_objtype_sink_set_commit_func(OSyncObjTypeSink *sink, OSyncSinkCommitFn commit_func); -OSYNC_EXPORT void osync_objtype_sink_set_write_func(OSyncObjTypeSink *sink, OSyncSinkWriteFn write_func); - OSYNC_EXPORT void osync_objtype_sink_set_committed_all_func(OSyncObjTypeSink *sink, OSyncSinkCommittedAllFn committed_all_func); OSYNC_EXPORT void osync_objtype_sink_set_read_func(OSyncObjTypeSink *sink, OSyncSinkReadFn read_func); Modified: trunk/opensync/plugin/opensync_objtype_sink_internals.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink_internals.h Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/plugin/opensync_objtype_sink_internals.h Mon Mar 30 00:16:21 2009 (r5435) @@ -37,7 +37,6 @@ OSyncSinkDisconnectFn disconnect; OSyncSinkGetChangesFn get_changes; OSyncSinkCommitFn commit; - OSyncSinkWriteFn write; OSyncSinkCommittedAllFn committed_all; OSyncSinkReadFn read; OSyncSinkBatchCommitFn batch_commit; @@ -111,21 +110,6 @@ */ void osync_objtype_sink_set_function_getchanges(OSyncObjTypeSink *sink, osync_bool getchanges); -/** @brief Checks if sink has a write function (commit) - * - * @param sink Pointer to the sink - * @returns TRUE if the sink has a write function (commit), FALSE otherwise - */ -osync_bool osync_objtype_sink_get_function_write(OSyncObjTypeSink *sink); - -/** @brief Sets the status of the write sink function - * - * @param sink Pointer to sink - * @param write TRUE if the sink has a write function, FALSE otherwise - */ -void osync_objtype_sink_set_function_write(OSyncObjTypeSink *sink, osync_bool write); - - /** @brief Get the current or default connect timeout in seconds * * @param sink Pointer to the sink @@ -260,23 +244,6 @@ */ unsigned int osync_objtype_sink_get_connectdone_timeout(OSyncObjTypeSink *sink); -/** @brief Get the current or default write timeout in seconds - * - * @param sink Pointer to the sink - * @return The timeout in seconds - * - */ -unsigned int osync_objtype_sink_get_write_timeout_or_default(OSyncObjTypeSink *sink); - -/** @brief Get the current write timeout in seconds - * - * @param sink Pointer to the sink - * @return The timeout in seconds - * - */ -unsigned int osync_objtype_sink_get_write_timeout(OSyncObjTypeSink *sink); - - /** @brief Get the current or default read timeout in seconds * * @param sink Pointer to the sink @@ -337,7 +304,6 @@ */ OSYNC_TEST_EXPORT OSyncObjFormatSink *osync_objtype_sink_nth_objformat_sink(OSyncObjTypeSink *sink, unsigned int nth); - /*@}*/ #endif /* _OPENSYNC_SINK_INTERNALS_H_*/ Modified: trunk/opensync/plugin/opensync_objtype_sink_private.h ============================================================================== --- trunk/opensync/plugin/opensync_objtype_sink_private.h Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/opensync/plugin/opensync_objtype_sink_private.h Mon Mar 30 00:16:21 2009 (r5435) @@ -33,7 +33,7 @@ #define OSYNC_SINK_TIMEOUT_BATCHIO 1800 /* FIXME: OSYNC_SINK_TIMEOUT_COMMIT, OSYNC_SINK_TIMEOUT_READ, - OSYNC_SINK_TIMEOUT_WRITE are set to OSYNC_SINK_TIMEOUT_BATCHIO + are set to OSYNC_SINK_TIMEOUT_BATCHIO to workaround a timeout issue with the async client/proxy communication and the current timeout handling. @@ -59,7 +59,6 @@ #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 */ -#define OSYNC_SINK_TIMEOUT_WRITE OSYNC_SINK_TIMEOUT_BATCHIO /* FIXME */ typedef struct OSyncObjTypeSinkFunctionTimeouts { unsigned int connect; @@ -71,7 +70,6 @@ unsigned int committed_all; unsigned int sync_done; unsigned int read; - unsigned int write; } OSyncObjTypeSinkFunctionTimeouts; struct OSyncObjTypeSink { @@ -104,8 +102,6 @@ /** The status if this sink is allowed to write (commit) */ osync_bool write; - /** The status if this sink has a write function (commit) */ - osync_bool func_write; /** The status if this sink is allowed to read (single entries) */ osync_bool read; Modified: trunk/tests/mock-plugin/mock_sync.c ============================================================================== --- trunk/tests/mock-plugin/mock_sync.c Mon Mar 30 00:14:57 2009 (r5434) +++ trunk/tests/mock-plugin/mock_sync.c Mon Mar 30 00:16:21 2009 (r5435) @@ -668,7 +668,6 @@ osync_objtype_sink_set_commit_func(sink, mock_commit_change); } osync_objtype_sink_set_read_func(sink, mock_read); - osync_objtype_sink_set_write_func(sink, mock_write); osync_objtype_sink_set_sync_done_func(sink, mock_sync_done); /* We pass the MockDir object to the sink, so we dont have to look it up @@ -691,7 +690,6 @@ osync_objtype_sink_set_disconnect_timeout(sink, 2); osync_objtype_sink_set_read_timeout(sink, 2); - osync_objtype_sink_set_write_timeout(sink, 2); /* XXX No testcase is currently using this at all! */ @@ -716,7 +714,6 @@ osync_objtype_sink_set_disconnect_timeout(sink, 0); osync_objtype_sink_set_read_timeout(sink, 0); - osync_objtype_sink_set_write_timeout(sink, 0); } /* What is meant by this?! Maybe OSyncPlugin.useable?! Not used at all... |
