Changeset 2

Timestamp:

11/30/04 21:16:17 (4 years ago)

Author:

azrael

Message:

Made osync_debug available to plugins

new random_modify and delete function

Location:

trunk

Files:

• plugins/file-sync/src/file_sync.c (modified) (13 diffs)
• src/opensync.h (modified) (1 diff)
• src/opensync_change.c (modified) (1 diff)
• src/opensync_change.h (modified) (1 diff)
• src/opensync_convert.c (modified) (5 diffs)
• src/opensync_debug.c (modified) (1 diff)
• src/opensync_env.c (modified) (13 diffs)
• src/opensync_group.c (modified) (7 diffs)
• src/opensync_internals.h (modified) (1 diff)
• src/opensync_mapping.c (modified) (3 diffs)
• src/opensync_mapping.h (modified) (1 diff)
• src/opensync_member.c (modified) (11 diffs)
• src/opensync_member.h (modified) (1 diff)
• src/opensync_plugin.c (modified) (7 diffs)
• src/opensync_user.c (modified) (1 diff)

trunk/plugins/file-sync/src/file_sync.c

@@ -44 +44 @@
 static void *fs_initialize(OSyncMember *member)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         char *configdata;
         int configsize;
@@ -84 +85 @@
 static void fs_connect(OSyncContext *ctx)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         GError *direrror = NULL;
@@ -108 +110 @@
 static void fs_get_changeinfo(OSyncContext *ctx)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         if (fsinfo->dir) {
@@ -145 +148 @@
 static void fs_get_data(OSyncContext *ctx, OSyncChange *change)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         fs_fileinfo *file_info = (fs_fileinfo *)osync_change_get_data(change);
@@ -158 +162 @@
 static osync_bool fs_access(OSyncContext *ctx, OSyncChange *change)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         fs_fileinfo *file_info = (fs_fileinfo *)osync_change_get_data(change);
@@ -167 +172 @@
                 case CHANGE_DELETED:
                         if (!remove(filename) == 0) {
-                                //osync_context_report_error(ctx, OSYNC_ERROR_FILE_NOT_FOUND, "Unable to write");
-                                osync_context_report_success(ctx);
+                                osync_debug("FILE-SYNC", 0, "Unable to remove file %s", filename);
+                                osync_context_report_error(ctx, OSYNC_ERROR_FILE_NOT_FOUND, "Unable to write");
                                 g_free(filename);
                                 return FALSE;
@@ -175 +180 @@
                 case CHANGE_ADDED:
                         if (g_file_test(filename, G_FILE_TEST_EXISTS)) {
+                                osync_debug("FILE-SYNC", 0, "File %s already exists", filename);
                                 osync_context_report_error(ctx, OSYNC_ERROR_EXISTS, "Entry already exists");
                                 g_free(filename);
@@ -181 +187 @@
                 case CHANGE_MODIFIED:
                         if (!osync_file_write(filename, file_info->data, file_info->size)) {
-                                //osync_context_report_error(ctx, OSYNC_ERROR_FILE_NOT_FOUND, "Unable to write");
-                                osync_context_report_success(ctx);
+                                osync_debug("FILE-SYNC", 0, "Unable to write to file %s", filename);
+                                osync_context_report_error(ctx, OSYNC_ERROR_FILE_NOT_FOUND, "Unable to write");
                                 g_free(filename);
                                 return FALSE;
@@ -190 +196 @@
                         break;
                 default:
-                        printf("Error1 %i\n", osync_change_get_changetype(change));
+                        osync_debug("FILE-SYNC", 0, "Unknown change type");
         }
         osync_context_report_success(ctx);
@@ -199 +205 @@
 static void fs_commit_change(OSyncContext *ctx, OSyncChange *change)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
+        osync_debug("FILE-SYNC", 3, "Writing change %s with changetype %i", osync_change_get_uid(change), osync_change_get_changetype(change));
         fs_access(ctx, change);
 
@@ -207 +215 @@
 static void fs_sync_done(OSyncContext *ctx)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         osync_hashtable_forget(fsinfo->hashtable);
@@ -215 +224 @@
 static void fs_disconnect(OSyncContext *ctx)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)osync_context_get_plugin_data(ctx);
         g_dir_close(fsinfo->dir);
@@ -222 +232 @@
 static void fs_finalize(void *data)
 {
+        osync_debug("FILE-SYNC", 4, "start: %s", __func__);
         filesyncinfo *fsinfo = (filesyncinfo *)data;
         osync_hashtable_close(fsinfo->hashtable);

trunk/src/opensync.h

@@ -116 +116 @@
 
 char *osync_rand_str(int maxlength);
+void osync_debug(char *subpart, int level, const char *message, ...);
+void osync_print_binary(unsigned char *data, int len);
 
 /**************************************************************

trunk/src/opensync_change.c

@@ -11 +11 @@
 void osync_change_free(OSyncChange *change)
 {
+        
         g_assert(change);
         //FIXME cleanly release the change!
         if (change->mapping)
                 osync_mapping_remove_entry(change->mapping, change);
+        if (change->member)
+                osync_member_remove_changeentry(change->member, change);
         g_free(change);
 }

trunk/src/opensync_change.h

@@ -31 +31 @@
 void osync_change_marshal(OSyncChange *change, DBT *dbt);
 osync_bool osync_change_has_data(OSyncChange *change);
+void osync_change_free(OSyncChange *change);

trunk/src/opensync_convert.c

@@ -31 +31 @@
         /* Check if this platform supports dynamic
          * loading of modules */
-        _osync_debug("OSFRM", 3, "Loading formats plugin from %s", path);
+        osync_debug("OSFRM", 3, "Loading formats plugin from %s", path);
         if (!g_module_supported()) {
-                _osync_debug("OSPLG", 0, "This platform does not support loading of modules");
+                osync_debug("OSPLG", 0, "This platform does not support loading of modules");
                 return;
         }
@@ -40 +40 @@
         GModule *plugin = g_module_open(path, 0);
         if (!plugin) {
-                _osync_debug("OSPLG", 0, "Unable to open plugin: %s", g_module_error());
+                osync_debug("OSPLG", 0, "Unable to open plugin: %s", g_module_error());
                 return;
         }
@@ -47 +47 @@
         void (** fct_infop)(OSyncConvEnv *env) = &fct_info;
         if (!g_module_symbol(plugin, "get_info", (void **)fct_infop)) {
-                _osync_debug("OSPLG", 0, "Unable to open format plugin %s: %s", path, g_module_error());
+                osync_debug("OSPLG", 0, "Unable to open format plugin %s: %s", path, g_module_error());
                 return;
         }
@@ -60 +60 @@
         GDir *dir;
         GError *error = NULL;
-        _osync_debug("OSPLG", 3, "Trying to open formats plugin directory %s", env->pluginpath);
+        osync_debug("OSPLG", 3, "Trying to open formats plugin directory %s", env->pluginpath);
         
         if (!g_file_test(env->pluginpath, G_FILE_TEST_EXISTS)) {
@@ -68 +68 @@
         dir = g_dir_open(env->pluginpath, 0, &error);
         if (error) {
-                _osync_debug("OSPLG", 0, "Unable to open formats plugin directory %s: %s", env->pluginpath, error->message);
+                osync_debug("OSPLG", 0, "Unable to open formats plugin directory %s: %s", env->pluginpath, error->message);
                 g_error_free (error);
                 return;

trunk/src/opensync_debug.c

@@ -2 +2 @@
 #include "opensync_internals.h"
 
-void _osync_debug(char *subpart, int level, const char *message, ...)
+void osync_debug(char *subpart, int level, const char *message, ...)
 {
                 va_list arglist;
                 char *buffer;
-                const gchar *debug = NULL;
+                int debug = -1;
 
                 va_start(arglist, message);
                 g_vasprintf(&buffer, message, arglist);
-
-                debug = g_getenv ("OSYNC_DEBUG");
-                if (debug) {
-                        printf("[%s] ERROR: %s\n", subpart, buffer);
+                
+                const char *dbgstr = g_getenv("OSYNC_DEBUG");
+                if (!dbgstr)
+                        return;
+                debug = atoi(dbgstr);
+                if (debug < level)
+                        return;
+                
+                switch (level) {
+                        case 0:
+                                //Error
+                                printf("[%s] ERROR: %s\n", subpart, buffer);
+                                break;
+                        case 1:
+                                // Warning
+                                printf("[%s] WARNING: %s\n", subpart, buffer);
+                                break;
+                case 2:
+                                //Information
+                                printf("[%s] INFORMATION: %s\n", subpart, buffer);
+                                break;
+                case 3:
+                                //debug
+                                printf("[%s] DEBUG: %s\n", subpart, buffer);
+                                break;
+                case 4:
+                                //fulldebug
+                                printf("[%s] FULL DEBUG: %s\n", subpart, buffer);
+                                break;
                 }
-                
-                /*
-                if (debug) {
-                        switch (level) {
-                                case 0:
-                                        //Error
-                                        printf("[%s] ERROR: %s\n", subpart, buffer);
-                                        break;
-                                case 1:
-                                        // Warning
-                                        printf("[%s] WARNING: %s\n", subpart, buffer);
-                                        break;
-                        case 2:
-                                        //Information
-                                        printf("[%s] INFORMATION: %s\n", subpart, buffer);
-                                        break;
-                        case 3:
-                                        //debug
-                                        printf("[%s] DEBUG: %s\n", subpart, buffer);
-                                        break;
-                        case 4:
-                                        //fulldebug
-                                        printf("[%s] FULL DEBUG: %s\n", subpart, buffer);
-                                        break;
-                        }
-                }*/
                 va_end(arglist);
 }

trunk/src/opensync_env.c

@@ -12 +12 @@
         os_env->conv_env = osync_conv_env_new();
 
-        _osync_debug("os_env", 3, "Generating new os_env:");
-        _osync_debug("os_env", 3, "Configdirectory: %s", os_env->configdir);
+        osync_debug("os_env", 3, "Generating new os_env:");
+        osync_debug("os_env", 3, "Configdirectory: %s", os_env->configdir);
         return os_env;
 }
@@ -29 +29 @@
                 index = g_list_length(os_env->groups);
                 _osync_append_group(os_env, group);
-                _osync_debug("os_env", 3, "Appending group %s to list with index %i", osync_group_get_name(group), index);
-        } else {
-                _osync_debug("os_env", 3, "Found group %s in list with index %i", osync_group_get_name(group), index);
+                osync_debug("os_env", 3, "Appending group %s to list with index %i", osync_group_get_name(group), index);
+        } else {
+                osync_debug("os_env", 3, "Found group %s in list with index %i", osync_group_get_name(group), index);
         }
         return index;
@@ -46 +46 @@
         //Load all available shared libraries (plugins)
         if (!g_file_test(os_env->plugindir, G_FILE_TEST_EXISTS)) {
-                _osync_debug("OSGRP", 3, "%s exists, but is no dir", os_env->plugindir);
+                osync_debug("OSGRP", 3, "%s exists, but is no dir", os_env->plugindir);
                 return FALSE;
         }
@@ -59 +59 @@
         GDir *dir;
         GError *error = NULL;
-        _osync_debug("OSGRP", 3, "Trying to open main confdir %s to load groups", osync_env_get_configdir(osyncinfo));
+        osync_debug("OSGRP", 3, "Trying to open main confdir %s to load groups", osync_env_get_configdir(osyncinfo));
         
         if (!g_file_test(osync_env_get_configdir(osyncinfo), G_FILE_TEST_EXISTS)) {
@@ -65 +65 @@
         } else {
                 if (!g_file_test(osync_env_get_configdir(osyncinfo), G_FILE_TEST_IS_DIR)) {
-                        _osync_debug("OSGRP", 3, "%s exists, but is now dir", osync_env_get_configdir(osyncinfo));
+                        osync_debug("OSGRP", 3, "%s exists, but is now dir", osync_env_get_configdir(osyncinfo));
                         return FALSE;
                 }
@@ -72 +72 @@
         dir = g_dir_open(osync_env_get_configdir(osyncinfo), 0, &error);
         if (error) {
-                _osync_debug("OSGRP", 3, "Unable to open main configdir %s: %s", osync_env_get_configdir(osyncinfo), error->message);
+                osync_debug("OSGRP", 3, "Unable to open main configdir %s: %s", osync_env_get_configdir(osyncinfo), error->message);
                 g_error_free (error);
                 return FALSE;
@@ -144 +144 @@
 {
         if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
-                _osync_debug("OSXML", 1, "File %s does not exist", path);
+                osync_debug("OSXML", 1, "File %s does not exist", path);
                 return FALSE;
         }
@@ -151 +151 @@
 
         if (!*doc) {
-                _osync_debug("OSXML", 1, "Could not open: %s", path);
+                osync_debug("OSXML", 1, "Could not open: %s", path);
                 return FALSE;
         }
@@ -158 +158 @@
 
         if (!*cur) {
-                _osync_debug("OSXML", 0, "%s seems to be empty", path);
+                osync_debug("OSXML", 0, "%s seems to be empty", path);
                 xmlFreeDoc(*doc);
                 return FALSE;
@@ -164 +164 @@
 
         if (xmlStrcmp((*cur)->name, (const xmlChar *) topentry)) {
-                _osync_debug("OSXML", 0, "%s seems not to be a valid configfile.\n", path);
+                osync_debug("OSXML", 0, "%s seems not to be a valid configfile.\n", path);
                 xmlFreeDoc(*doc);
                 return FALSE;
@@ -181 +181 @@
         GIOChannel *chan = g_io_channel_new_file(filename, "w", &error);
         if (!chan) {
-                _osync_debug("OSYNC", 3, "Unable to open file %s for writing: %s", filename, error->message);
+                osync_debug("OSYNC", 3, "Unable to open file %s for writing: %s", filename, error->message);
                 return FALSE;
         }
@@ -187 +187 @@
         g_io_channel_set_encoding(chan, NULL, NULL);
         if (g_io_channel_write_chars(chan, data, size, &writen, &error) != G_IO_STATUS_NORMAL) {
-                _osync_debug("OSYNC", 3, "Unable to read contents of file %s: %s", filename, error->message);
+                osync_debug("OSYNC", 3, "Unable to read contents of file %s: %s", filename, error->message);
         } else {
                 g_io_channel_flush(chan, NULL);
@@ -205 +205 @@
         GIOChannel *chan = g_io_channel_new_file(filename, "r", &error);
         if (!chan) {
-                _osync_debug("OSYNC", 3, "Unable to read file %s: %s", filename, error->message);
+                osync_debug("OSYNC", 3, "Unable to read file %s: %s", filename, error->message);
                 return FALSE;
         }
         g_io_channel_set_encoding(chan, NULL, NULL);
         if (g_io_channel_read_to_end(chan, data, size, &error) != G_IO_STATUS_NORMAL) {
-                _osync_debug("OSYNC", 3, "Unable to read contents of file %s: %s", filename, error->message);
+                osync_debug("OSYNC", 3, "Unable to read contents of file %s: %s", filename, error->message);
         } else {
                 ret = TRUE;

trunk/src/opensync_group.c

@@ -12 +12 @@
         group->configdir = filename;
         group->env = osinfo;
-        _osync_debug("OSGRP", 3, "Generated new group:");
-        //_osync_debug("OSMEM", 3, "Name: %s", group->name);
-        _osync_debug("OSGRP", 3, "Configdirectory: %s", filename);
+        osync_debug("OSGRP", 3, "Generated new group:");
+        //osync_debug("OSMEM", 3, "Name: %s", group->name);
+        osync_debug("OSGRP", 3, "Configdirectory: %s", filename);
         return group;
 }
@@ -28 +28 @@
 void osync_group_set_name(OSyncGroup *group, char *name)
 {
-        _osync_debug("OSGRP", 3, "Setting name of group %s to %s", group->name, name);
+        osync_debug("OSGRP", 3, "Setting name of group %s to %s", group->name, name);
         group->name = g_strdup(name);
 }
@@ -40 +40 @@
 {
         char *filename = NULL;
-        _osync_debug("OSGRP", 3, "Trying to open configdirectory %s to save group %s", group->configdir, group->name);
+        osync_debug("OSGRP", 3, "Trying to open configdirectory %s to save group %s", group->configdir, group->name);
         int i;
                 
         if (!g_file_test(group->configdir, G_FILE_TEST_IS_DIR)) {
-                _osync_debug("OSGRP", 3, "Creating configdirectory %s", group->configdir);
+                osync_debug("OSGRP", 3, "Creating configdirectory %s", group->configdir);
                 mkdir(group->configdir, 0777);
         }
         
         filename = g_strdup_printf ("%s/syncgroup.conf", group->configdir);
-        _osync_debug("OSGRP", 3, "Saving group to file %s", filename);
+        osync_debug("OSGRP", 3, "Saving group to file %s", filename);
         
         xmlDocPtr doc;
@@ -73 +73 @@
         char *filename = NULL;
         
-        _osync_debug("OSGRP", 3, "Trying to load group from directory %s", path);
+        osync_debug("OSGRP", 3, "Trying to load group from directory %s", path);
         OSyncGroup *group = osync_group_new(env);
         osync_group_set_configdir(group, path);
@@ -105 +105 @@
         dir = g_dir_open(osync_group_get_configdir(group), 0, &error);
         if (error) {
-                _osync_debug("OSGRP", 3, "Unable to open group configdir %s", error->message);
+                osync_debug("OSGRP", 3, "Unable to open group configdir %s", error->message);
                 g_error_free (error);
                 osync_group_free(group);
@@ -150 +150 @@
 void osync_group_set_configdir(OSyncGroup *group, char *path)
 {
-        _osync_debug("OSGRP", 3, "Setting configdirectory of group %s to %s", group->name, path);
+        osync_debug("OSGRP", 3, "Setting configdirectory of group %s to %s", group->name, path);
         group->configdir = g_strdup(path);
 }
@@ -175 +175 @@
                 }
         }
-        _osync_debug("OSPLG", 0, "Couldnt find the group with the name %s", name);
+        osync_debug("OSPLG", 0, "Couldnt find the group with the name %s", name);
         return NULL;
 }

trunk/src/opensync_internals.h

@@ -8 +8 @@
 
 osync_bool osync_plugin_load_dir(OSyncEnv *os_env, char *path);
-void _osync_debug(char *subpart, int level, const char *message, ...);
 OSyncUserInfo *_osync_get_user(void);
 osync_bool _osync_open_xml_file(xmlDocPtr *doc, xmlNodePtr *cur, char *path, char *topentry);
-void osync_print_binary(unsigned char *data, int len);
 osync_bool osync_conv_find_shortest_path(GList *vertices, OSyncObjFormat *start, OSyncObjFormat *end, GList **retlist);
 void osync_error_set_vargs(OSyncError *error, OSyncErrorType type, const char *format, va_list args);

trunk/src/opensync_mapping.c

@@ -11 +11 @@
 void osync_mappingtable_free(OSyncMappingTable *table)
 {
-        g_list_free(table->mappings);
+        GList *c = NULL;
+        GList *m = NULL;
+        GList *mappings = g_list_copy(table->mappings);
+        GList *unmapped = g_list_copy(table->unmapped);
+
+        for (m = mappings; m; m = m->next) {
+                OSyncMapping *mapping = m->data;
+                osync_mapping_free(mapping);
+        }
+        for (c = unmapped; c; c = c->next) {
+                OSyncChange *change = c->data;
+                osync_change_free(change);
+        }
+        g_list_free(mappings);
+        g_list_free(unmapped);
         g_free(table->db_path);
-        g_list_free(table->unmapped);
         g_free(table);
 }
@@ -144 +157 @@
 void osync_mapping_free(OSyncMapping *mapping)
 {
+        GList *c = NULL;
+        GList *entries = g_list_copy(mapping->entries);
+        for (c = entries; c; c = c->next) {
+                OSyncChange *change = c->data;
+                osync_change_free(change);
+        }
+        g_list_free(entries);
         osync_mappingtable_remove_mapping(mapping->table, mapping);
         g_free(mapping);
@@ -221 +241 @@
         for (i = 0; i < g_list_length(mapping->entries); i++) {
                 OSyncChange *change = g_list_nth_data(mapping->entries, i);
-                if (change->member == member)
+                if (osync_member_get_id(change->member) == osync_member_get_id(member))
                         return change;
         }

trunk/src/opensync_mapping.h

@@ -38 +38 @@
 void osync_mapping_remove_entry(OSyncMapping *mapping, OSyncChange *entry);
 void osync_mappingtable_free(OSyncMappingTable *table);
+void osync_mapping_free(OSyncMapping *mapping);

trunk/src/opensync_member.c

@@ -24 +24 @@
         member->memberfunctions = osync_memberfunctions_new();
         //printf("hashtable: %p\n", member->hashtable);
-        _osync_debug("OSMEM", 3, "Generated new member");
-        //_osync_debug("OSMEM", 3, "Name: %s, %p", member->name, member);
-        //_osync_debug("OSMEM", 3, "Configdirectory: %s", filename);
+        osync_debug("OSMEM", 3, "Generated new member");
+        //osync_debug("OSMEM", 3, "Name: %s, %p", member->name, member);
+        //osync_debug("OSMEM", 3, "Configdirectory: %s", filename);
 
         return member;
@@ -38 +38 @@
 osync_bool osync_member_instance_plugin(OSyncMember *member, OSyncPlugin *plugin)
 {
-        _osync_debug("OSMEM", 3, "Insstancing plugin %s for member %i", osync_plugin_get_name(plugin), member->id);
+        osync_debug("OSMEM", 3, "Insstancing plugin %s for member %i", osync_plugin_get_name(plugin), member->id);
         if (plugin->info.is_threadsafe) {
                 member->plugin = plugin;
@@ -77 +77 @@
 osync_bool osync_member_set_configdir(OSyncMember *member, char *path)
 {
-        _osync_debug("OSMEM", 3, "Setting configdirectory for member %i to %s", member->id, path);
+        osync_debug("OSMEM", 3, "Setting configdirectory for member %i to %s", member->id, path);
         member->configdir = g_strdup(path);
         return TRUE; //FIXME