Changeset 2564

Timestamp:

10/14/07 19:54:56 (1 year ago)

Author:

dgollub

Message:

Fixed osync_mapping_engine_supports_ignore() - it makes now use of
osync_objtype_sink_get_function_read() instead of
osync_objtype_sink_get_read():

+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_read(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_read(OSyncObjTypeSink *sink, osync_bool read);
+
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_getchanges(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_getchanges(OSyncObjTypeSink *sink, osync_bool getchanges);
+
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_write(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_write(OSyncObjTypeSink *sink, osync_bool write);

If you want to setup a unidirectional sync and and change a member
objtype sink to "read-only", "write-only" or something compeletely
different use:

OSYNC_EXPORT osync_bool osync_objtype_sink_get_write(OSyncObjTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_write(OSyncObjTypeSink *sink, osync_bool write);

+OSYNC_EXPORT osync_bool osync_objtype_sink_get_getchanges(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_getchanges(OSyncObjTypeSink *sink, osync_bool write);
+

OSYNC_EXPORT osync_bool osync_objtype_sink_get_read(OSyncObjTypeSink *sink);
OSYNC_EXPORT void osync_objtype_sink_set_read(OSyncObjTypeSink *sink, osync_bool read);

---

Dropped osync_member_add_objtype(). Use osync_member_add_objtype_sink()
instead:

-OSYNC_EXPORT void osync_member_add_objtype(OSyncMember *member, const char *objtype);
+OSYNC_EXPORT void osync_member_add_objtype_sink(OSyncMember *member, OSyncObjTypeSink *sink);

Files:

• trunk/opensync/client/opensync_client_proxy.c (modified) (1 diff)
• trunk/opensync/engine/opensync_obj_engine.c (modified) (1 diff)
• trunk/opensync/group/opensync_member.c (modified) (4 diffs)
• trunk/opensync/group/opensync_member.h (modified) (1 diff)
• trunk/opensync/ipc/opensync_serializer.c (modified) (5 diffs)
• trunk/opensync/plugin/opensync_sink.c (modified) (7 diffs)
• trunk/opensync/plugin/opensync_sink.h (modified) (2 diffs)
• trunk/opensync/plugin/opensync_sink_internals.h (modified) (1 diff)
• trunk/tests/engine-tests/check_engine.c (modified) (17 diffs)
• trunk/tests/engine-tests/check_engine_error.c (modified) (10 diffs)

trunk/opensync/client/opensync_client_proxy.c

@@ -321 +321 @@
-                        if (!osync_demarshal_objtype_sink(message, &sink, &locerror))
-                                goto error;
-
-
+
-                        proxy->objtypes = g_list_append(proxy->objtypes, sink);
-
-
-
-
-
-
-
-
-
+
+
+
-                }
-                

trunk/opensync/engine/opensync_obj_engine.c

@@ -365 +365 @@
-                OSyncObjTypeSink *objtype_sink = osync_member_find_objtype_sink(member, objtype);
-
-
-
-
+
+
-                        ignore_supported = FALSE; 
-

trunk/opensync/group/opensync_member.c

@@ -167 +167 @@
-                        osync_merger_unref(osync_member_get_merger(member));
-                
-
-
-
-
-
-
+
+
-                g_free(member);
-        }
@@ -440 +436 @@
-                                if (!sink)
-                                        goto error_free_doc;
+
-                                member->objtypes = g_list_append(member->objtypes, sink);
-                        }
@@ -645 +642 @@
-}
-
-object type
+OSyncObjTypeSink object
- * 
- * @param member The member pointer
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -794 +803 @@
-        osync_assert(member);
-
-
-
-
-
-
-
+
+
+
+
+
-}
-

trunk/opensync/group/opensync_member.h

@@ -46 +46 @@
-OSYNC_EXPORT long long int osync_member_get_id(OSyncMember *member);
-
-OSYNC_EXPORT void osync_member_add_objtype(OSyncMember *member, const char *objtype);
-OSYNC_EXPORT int osync_member_num_objtypes(OSyncMember *member);
-OSYNC_EXPORT const char *osync_member_nth_objtype(OSyncMember *member, int nth);
+
+OSYNC_EXPORT void osync_member_add_objtype_sink(OSyncMember *member, OSyncObjTypeSink *sink);
-OSYNC_EXPORT OSyncObjTypeSink *osync_member_find_objtype_sink(OSyncMember *member, const char *objtype);
-

trunk/opensync/ipc/opensync_serializer.c

@@ -213 +213 @@
-         * 
-         * name
+         * read function (bool)
+         * get_changes function (bool)
+         * write function (bool)
-         * number of formats
-         * format list (string)
@@ -220 +223 @@
-        int num = osync_objtype_sink_num_objformats(sink);
-        osync_message_write_string(message, osync_objtype_sink_get_name(sink));
+
+        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_int(message, num);
-        
-        for (i = 0; i < num; i++) {
-                const char *format = osync_objtype_sink_nth_objformat(sink, i);
@@ -237 +244 @@
-         * 
-         * name
+         * read function (bool)
+         * get_changes function (bool)
+         * write function (bool)
-         * number of formats
-         * format list (string)
@@ -248 +258 @@
-        int num_formats = 0;
-        int enabled = 0;
+        int read = 0, get_changes = 0, write = 0;
-        char *format = NULL;
-        
@@ -254 +265 @@
-        g_free(name);
-        
+        osync_message_read_int(message, &read);
+        osync_objtype_sink_set_function_read(*sink, read);
+
+        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_int(message, &num_formats);
-        int i = 0;

trunk/opensync/plugin/opensync_sink.c

@@ -51 +51 @@
-        
-        sink->read = TRUE;
+        sink->getchanges = TRUE;
-        sink->write = TRUE;
+
-        sink->enabled = TRUE;
-        
@@ -218 +220 @@
-        sink->userdata = userdata;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -526 +597 @@
-}
-
-ble
-
-ble
+llowed
+
+llowed
- * the sink.
- *
- * @param sink Pointer to the sink
-ble
+llowed
- */
-osync_bool osync_objtype_sink_get_write(OSyncObjTypeSink *sink)
@@ -542 +613 @@
-/*! @brief Sets the write status of the sink (commit)
- *
- * This function should only called 
- * See osync_objtype_sink_get_write()
- *
- * @param sink Pointer to sink
-vailable
+llowed to write changes (commit)
- *
- */
@@ -555 +625 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
- * "Read" means to request a single entry and does not mean to get the
@@ -561 +657 @@
- * The read function explicitly means to read a single entry without triggering
- * a full sync. This is used for example to check if a conflict between entries
-ble
+llowed
- * read this conflicting entries on the next sync without triggering a SlowSync.
- *
- * @param sink Pointer to the sink
-ble
+llowed
- *
- */
@@ -584 +680 @@
-void osync_objtype_sink_set_read(OSyncObjTypeSink *sink, osync_bool read)
-{
-        osync_trace(TRACE_INTERNAL, "%s: %i", __func__, read);
-        osync_assert(sink);
-        sink->read = read;

trunk/opensync/plugin/opensync_sink.h

@@ -59 +59 @@
-OSYNC_EXPORT void *osync_objtype_sink_get_userdata(OSyncObjTypeSink *sink);
-
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_read(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_read(OSyncObjTypeSink *sink, osync_bool read);
+
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_getchanges(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_getchanges(OSyncObjTypeSink *sink, osync_bool getchanges);
+
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_function_write(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_function_write(OSyncObjTypeSink *sink, osync_bool write);
+
-OSYNC_EXPORT void osync_objtype_sink_get_changes(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncContext *ctx);
-OSYNC_EXPORT void osync_objtype_sink_read_change(OSyncObjTypeSink *sink, void *plugindata, OSyncPluginInfo *info, OSyncChange *change, OSyncContext *ctx);
@@ -77 +86 @@
-OSYNC_EXPORT void osync_objtype_sink_set_write(OSyncObjTypeSink *sink, osync_bool write);
-
+OSYNC_EXPORT osync_bool osync_objtype_sink_get_getchanges(OSyncObjTypeSink *sink);
+OSYNC_EXPORT void osync_objtype_sink_set_getchanges(OSyncObjTypeSink *sink, osync_bool write);
+
-OSYNC_EXPORT osync_bool osync_objtype_sink_get_read(OSyncObjTypeSink *sink);
-OSYNC_EXPORT void osync_objtype_sink_set_read(OSyncObjTypeSink *sink, osync_bool read);

trunk/opensync/plugin/opensync_sink_internals.h

@@ -32 +32 @@
-        char *objtype;
-
-ble
+llowed
-        osync_bool write;
+        /** The status if this sink has a write function (commit) */
+        osync_bool func_write;
-
-ble
+llowed
-        osync_bool read;
+        /** The status if this sink has a read function (single entries) */
+        osync_bool func_read;
+
+        /** The status if this sink is allowed to get_changes (latest changed entries) */
+        osync_bool getchanges; 
+        /** The status if this sink has a get_changes function (latest changed entries) */
+        osync_bool func_getchanges; 
-
-        /** The status of this sink */

trunk/tests/engine-tests/check_engine.c

@@ -12 +12 @@
-#include "../mock-plugin/mock_format.h"
-
+static void _member_add_objtype(OSyncMember *member, const char *objtype)
+{
+       OSyncObjTypeSink *sink = NULL;
+       osync_assert(member);
+       osync_assert(objtype);
+
+       if (!osync_member_find_objtype_sink(member, objtype)) {
+               sink = osync_objtype_sink_new(objtype, NULL);
+               osync_member_add_objtype_sink(member, sink);
+       }
+}
+
-START_TEST (engine_new)
-{
@@ -57 +69 @@
-        fail_unless(error == NULL, NULL);
-        osync_group_add_member(group, member);
-osync
+
-        osync_member_set_pluginname(member, "mock-sync");
-        path = g_strdup_printf("%s/configs/group/1", testbed);
@@ -67 +79 @@
-        fail_unless(error == NULL, NULL);
-        osync_group_add_member(group, member);
-osync
+
-        osync_member_set_pluginname(member, "mock-sync");
-        path = g_strdup_printf("%s/configs/group/1", testbed);
@@ -211 +223 @@
-        g_free(path);
-
-osync
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -222 +234 @@
-        g_free(path);
-
-osync
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -518 +530 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-osync
-osync
-osync
+
+
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -531 +543 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -920 +932 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-osync
-osync
-osync
+
+
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -933 +945 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -1142 +1154 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -1155 +1167 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -1410 +1422 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-osync
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -1421 +1433 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -1606 +1618 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-osync
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -1617 +1629 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);
@@ -1806 +1818 @@
-        g_free(path);
-
-osync
+
-        
-        debug->member2 = osync_member_new(&error);
@@ -1817 +1829 @@
-        g_free(path);
-
-osync
-osync
-osync
+
+
+
-        
-        debug->plugin = osync_plugin_new(&error);

trunk/tests/engine-tests/check_engine_error.c

@@ -126 +126 @@
-}
-
+static void _member_add_objtype(OSyncMember *member, const char *objtype)
+{
+       OSyncObjTypeSink *sink = NULL;
+       osync_assert(member);
+       osync_assert(objtype);
+
+       if (!osync_member_find_objtype_sink(member, objtype)) {
+               sink = osync_objtype_sink_new(objtype, NULL);
+               osync_member_add_objtype_sink(member, sink);
+       }
+}
+
-int num_engine_connected = 0;
-int num_engine_read = 0;
@@ -403 +415 @@
-        osync_member_set_configdir(debug->member1, path);
-        g_free(path);
-osync
+
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -416 +428 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -488 +500 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -501 +513 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -573 +585 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
-        
@@ -585 +597 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
-        
@@ -656 +668 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -739 +751 @@
-        g_free(path);
-
-osync
+
-        osync_member_add_objformat(debug->member1, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member1, "<config><directory><path>data1</path><objtype>mockobjtype1</objtype></directory></config>");
@@ -751 +763 @@
-        osync_member_set_configdir(debug->member2, path);
-        g_free(path);
-osync
+
-        osync_member_add_objformat(debug->member2, "mockobjtype1", "mockformat1");
-        osync_member_set_config(debug->member2, "<config><directory><path>data2</path><objtype>mockobjtype1</objtype></directory></config>");