Changeset 423

Timestamp:

03/31/05 10:42:14 (4 years ago)

Author:

abauer

Message:

Added fail_unlesses for the batch commit functions of the
mock sync plugin.

Fixed the committed_all signal generation

Location:

trunk

Files:

• formats/vformats-xml/xml-vcal.c (modified) (4 diffs)
• opensync/opensync_debug.c (modified) (1 diff)
• osengine/osengine_engine.c (modified) (5 diffs)
• osengine/osengine_engine_internals.h (modified) (1 diff)
• osengine/osengine_flags.c (modified) (1 diff)
• osengine/osengine_flags_internals.h (modified) (1 diff)
• osengine/osengine_mapcmds.c (modified) (2 diffs)
• osengine/osengine_mapping.c (modified) (3 diffs)
• osengine/osengine_mapping_internals.h (modified) (1 diff)
• tests/mock-plugin/mock_sync.c (modified) (2 diffs)

trunk/formats/vformats-xml/xml-vcal.c

@@ -348 +348 @@
 static xmlNode *handle_organizer_attribute(xmlNode *root, VFormatAttribute *attr)
 {
-        osync_trace(TRACE_INTERNAL, "Handling last_modified attribute");
         xmlNode *current = xmlNewChild(root, NULL, (xmlChar*)"Organizer", NULL);
         osxml_node_add(current, "Content", vformat_attribute_get_nth_value(attr, 0));
@@ -356 +355 @@
 static xmlNode *handle_recurid_attribute(xmlNode *root, VFormatAttribute *attr)
 {
-        osync_trace(TRACE_INTERNAL, "Handling last_modified attribute");
         xmlNode *current = xmlNewChild(root, NULL, (xmlChar*)"RecurrenceID", NULL);
         osxml_node_add(current, "Content", vformat_attribute_get_nth_value(attr, 0));
@@ -364 +362 @@
 static xmlNode *handle_status_attribute(xmlNode *root, VFormatAttribute *attr)
 {
-        osync_trace(TRACE_INTERNAL, "Handling last_modified attribute");
         xmlNode *current = xmlNewChild(root, NULL, (xmlChar*)"Status", NULL);
         osxml_node_add(current, "Content", vformat_attribute_get_nth_value(attr, 0));
@@ -372 +369 @@
 static xmlNode *handle_duration_attribute(xmlNode *root, VFormatAttribute *attr)
 {
-        osync_trace(TRACE_INTERNAL, "Handling last_modified attribute");
         xmlNode *current = xmlNewChild(root, NULL, (xmlChar*)"Duration", NULL);
         osxml_node_add(current, "Content", vformat_attribute_get_nth_value(attr, 0));

trunk/opensync/opensync_debug.c

@@ -127 +127 @@
 /*! @brief Used for debugging
  * 
- * Used for debugging. Severity ranges from 0=Error to 5=Full Debug
+ * Used for debugging. Severity ranges from 0=Error to 4=Full Debug
  * 
  * @param subpart String to identify the subpart (and filter on it)

trunk/osengine/osengine_engine.c

@@ -339 +339 @@
         OSyncPluginTimeouts timeouts = osync_client_get_timeouts(entry->client);
         itm_queue_send_with_timeout(entry->client->incoming, message, timeouts.commit_timeout, sender);
+        
+        g_assert(osync_flag_is_attached(entry->fl_committed) == TRUE);
+        osync_flag_detach(entry->fl_committed);
 }
 
@@ -519 +522 @@
 }
 
-static void trigger_engine_multiplied(OSyncEngine *engine)
+static void trigger_engine_committed_all(OSyncEngine *engine)
 {
         osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine);
@@ -587 +590 @@
         osync_flag_set_state(engine->cmb_connected, FALSE);
         osync_flag_set_state(engine->cmb_read_all, TRUE);
-        osync_flag_set_state(engine->cmb_multiplied, FALSE);
+        osync_flag_set_state(engine->cmb_committed_all, TRUE);
         itm_queue_flush(engine->incoming);
         
@@ -675 +678 @@
         osync_flag_set_pos_trigger(engine->cmb_chkconflict, (OSyncFlagTriggerFunc)trigger_status_end_conflicts, engine, NULL);
         
-        engine->cmb_multiplied = osync_comb_flag_new(FALSE, FALSE);
-        osync_flag_set_pos_trigger(engine->cmb_multiplied, (OSyncFlagTriggerFunc)trigger_engine_multiplied, engine, NULL);
+        engine->cmb_committed_all = osync_comb_flag_new(FALSE, TRUE);
+        osync_flag_set_pos_trigger(engine->cmb_committed_all, (OSyncFlagTriggerFunc)trigger_engine_committed_all, engine, NULL);
         
         osync_flag_set(engine->fl_sync);
@@ -722 +725 @@
         osync_flag_free(engine->cmb_connected);
         osync_flag_free(engine->cmb_read_all);
-        osync_flag_free(engine->cmb_multiplied);
+        osync_flag_free(engine->cmb_committed_all);
         
         itm_queue_flush(engine->incoming);

trunk/osengine/osengine_engine_internals.h

@@ -46 +46 @@
         OSyncFlag *cmb_chkconflict;
         OSyncFlag *cmb_read_all;
-        OSyncFlag *cmb_multiplied;
+        //OSyncFlag *cmb_multiplied;
+        OSyncFlag *cmb_committed_all;
         
         osync_bool man_dispatch;

trunk/osengine/osengine_flags.c

@@ -61 +61 @@
         }
         osync_flag_calculate_comb(target);
+}
+
+osync_bool osync_flag_is_attached(OSyncFlag *flag)
+{
+        if (flag->comb_flag)
+                return TRUE;
+        return FALSE;
 }
 

trunk/osengine/osengine_flags_internals.h

@@ -51 +51 @@
 void osync_flag_attach(OSyncFlag *flag, OSyncFlag *target);
 void osync_flag_detach(OSyncFlag *flag);
+osync_bool osync_flag_is_attached(OSyncFlag *flag);

trunk/osengine/osengine_mapcmds.c

@@ -120 +120 @@
         if (osync_flag_is_not_set(master->fl_dirty))
                 osync_flag_set(master->fl_synced);
-        
+        else
+                osync_flag_attach(master->fl_committed, table->engine->cmb_committed_all);
+                
         //Send the change to every source that is different to the master source and set state to writing in the changes
         GList *v;
@@ -163 +165 @@
                         OSyncError *error = NULL;
                         osync_change_save(entry->change, TRUE, &error);
+                        osync_flag_attach(entry->fl_committed, table->engine->cmb_committed_all);
                 }
         }

trunk/osengine/osengine_mapping.c

@@ -291 +291 @@
                 osync_flag_attach(mapping->cmb_synced, table->engine->cmb_synced);
                 osync_flag_attach(mapping->fl_chkconflict, table->engine->cmb_chkconflict);
-                osync_flag_attach(mapping->fl_multiplied, table->engine->cmb_multiplied);
         }
         osync_trace(TRACE_INTERNAL, "osengine_mapping_new(%p): %p", table, mapping);
@@ -492 +491 @@
         entry->fl_deleted = osync_flag_new(NULL);
         entry->fl_read = osync_flag_new(NULL);
+        entry->fl_committed = osync_flag_new(NULL);
         osync_flag_set(entry->fl_synced);
         
@@ -514 +514 @@
         osync_flag_free(entry->fl_deleted);
         osync_flag_free(entry->fl_read);
+        osync_flag_free(entry->fl_committed);
         
         entry->view->changes = g_list_remove(entry->view->changes, entry);

trunk/osengine/osengine_mapping_internals.h

@@ -46 +46 @@
         OSyncFlag *fl_deleted;
         OSyncFlag *fl_read;
+        OSyncFlag *fl_committed;
 };
 #endif

trunk/tests/mock-plugin/mock_sync.c

@@ -298 +298 @@
         mock_env *env = (mock_env *)osync_context_get_plugin_data(ctx);
         
-        //fail_unless(env->committed_all == FALSE, NULL);
+        fail_unless(env->committed_all == FALSE, NULL);
         
         char *filename = NULL;
@@ -350 +350 @@
         mock_env *env = (mock_env *)osync_context_get_plugin_data(ctx);
         
-        //fail_unless(env->committed_all == FALSE, NULL);
+        fail_unless(env->committed_all == FALSE, NULL);
         
         if (mock_get_error(env->member, "COMMIT_ERROR")) {