Menu
▾
▴
[Opensync-commits] r5408 - osynctool/trunk/tools
|
From: <svn...@op...> - 2009-03-28 21:43:31
|
Author: dgollub Date: Sat Mar 28 22:43:27 2009 New Revision: 5408 URL: http://www.opensync.org/changeset/5408 Log: Ported osycntool to Engine-Event/Status API changes from r5407. Fixed some compiler warnings about unused variables and unhandeld valenums. Modified: osynctool/trunk/tools/osynctool.c Modified: osynctool/trunk/tools/osynctool.c ============================================================================== --- osynctool/trunk/tools/osynctool.c Sat Mar 28 22:42:14 2009 (r5407) +++ osynctool/trunk/tools/osynctool.c Sat Mar 28 22:43:27 2009 (r5408) @@ -175,7 +175,6 @@ static void osynctool_list_plugins(OSyncPluginEnv *env) { - int i; OSyncPlugin *plugin; OSyncList *plugins, *p; @@ -224,38 +223,45 @@ return NULL; } -static void member_status(OSyncMemberUpdate *status, void *user_data) +static void member_status(OSyncEngineMemberUpdate *status, void *user_data) { - osync_trace(TRACE_ENTRY, "%s(%p (%i), %p)", __func__, status, status->type, user_data); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, status, user_data); + + OSyncMember *member = osync_engine_member_update_get_member(status); + const char *objtype = osync_engine_member_update_get_objtype(status); + OSyncError *error = osync_engine_member_update_get_error(status); char *sink = NULL; - if (status->objtype == NULL) { + if (objtype == NULL) { sink = g_strdup("Main sink"); } else { - sink = g_strdup_printf("%s sink", status->objtype); + sink = g_strdup_printf("%s sink", objtype); } - switch (status->type) { - case OSYNC_CLIENT_EVENT_CONNECTED: - printf("%s of member %lli of type %s just connected\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + switch (osync_engine_member_update_get_event(status)) { + case OSYNC_ENGINE_MEMBER_EVENT_CONNECTED: + printf("%s of member %lli of type %s just connected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); + break; + case OSYNC_ENGINE_MEMBER_EVENT_CONNECT_DONE: + /* Special event - but not interesting for the normal user. */ break; - case OSYNC_CLIENT_EVENT_DISCONNECTED: - printf("%s of member %lli of type %s just disconnected\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + case OSYNC_ENGINE_MEMBER_EVENT_DISCONNECTED: + printf("%s of member %lli of type %s just disconnected\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); break; - case OSYNC_CLIENT_EVENT_READ: - printf("%s of member %lli of type %s just sent all changes\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + case OSYNC_ENGINE_MEMBER_EVENT_READ: + printf("%s of member %lli of type %s just sent all changes\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); break; - case OSYNC_CLIENT_EVENT_WRITTEN: - printf("%s of member %lli of type %s committed all changes.\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + case OSYNC_ENGINE_MEMBER_EVENT_WRITTEN: + printf("%s of member %lli of type %s committed all changes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); break; - case OSYNC_CLIENT_EVENT_SYNC_DONE: - printf("%s of member %lli of type %s reported sync done.\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + case OSYNC_ENGINE_MEMBER_EVENT_SYNC_DONE: + printf("%s of member %lli of type %s reported sync done.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); break; - case OSYNC_CLIENT_EVENT_DISCOVERED: - printf("%s of member %lli of type %s discovered its objtypes.\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member)); + case OSYNC_ENGINE_MEMBER_EVENT_DISCOVERED: + printf("%s of member %lli of type %s discovered its objtypes.\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member)); break; - case OSYNC_CLIENT_EVENT_ERROR: - printf("%s of member %lli of type %s had an error: %s\n", sink, osync_member_get_id(status->member), osync_member_get_pluginname(status->member), osync_error_print(&(status->error))); + case OSYNC_ENGINE_MEMBER_EVENT_ERROR: + printf("%s of member %lli of type %s had an error: %s\n", sink, osync_member_get_id(member), osync_member_get_pluginname(member), osync_error_print(&error)); break; } @@ -370,64 +376,85 @@ return; } -static void entry_status(OSyncChangeUpdate *status, void *user_data) +static void entry_status(OSyncEngineChangeUpdate *status, void *user_data) { - osync_trace(TRACE_ENTRY, "%s(%p (%i), %p)", __func__, status, status->type, user_data); + osync_trace(TRACE_ENTRY, "%s(%p, %p)", __func__, status, user_data); + + OSyncChange *change = osync_engine_change_update_get_change(status); + OSyncMember *member = osync_engine_change_update_get_member(status); + OSyncError *error = osync_engine_change_update_get_error(status); - switch (status->type) { - case OSYNC_CHANGE_EVENT_READ: + switch (osync_engine_change_update_get_event(status)) { + case OSYNC_ENGINE_CHANGE_EVENT_READ: printf("Received an entry %s (%s) from member %lli (%s). Changetype %s\n", - osync_change_get_uid(status->change), - osync_objformat_get_name(osync_change_get_objformat(status->change)), - osync_member_get_id(status->member), - osync_member_get_pluginname(status->member), - OSyncChangeType2String(osync_change_get_changetype(status->change))); + osync_change_get_uid(change), + osync_objformat_get_name(osync_change_get_objformat(change)), + osync_member_get_id(member), + osync_member_get_pluginname(member), + OSyncChangeType2String(osync_change_get_changetype(change))); break; - case OSYNC_CHANGE_EVENT_WRITTEN: + case OSYNC_ENGINE_CHANGE_EVENT_WRITTEN: printf("Sent an entry %s (%s) to member %lli (%s). Changetype %s\n", - osync_change_get_uid(status->change), - osync_objformat_get_name(osync_change_get_objformat(status->change)), - osync_member_get_id(status->member), - osync_member_get_pluginname(status->member), - OSyncChangeType2String(osync_change_get_changetype(status->change))); + osync_change_get_uid(change), + osync_objformat_get_name(osync_change_get_objformat(change)), + osync_member_get_id(member), + osync_member_get_pluginname(member), + OSyncChangeType2String(osync_change_get_changetype(change))); break; - case OSYNC_CHANGE_EVENT_ERROR: + case OSYNC_ENGINE_CHANGE_EVENT_ERROR: printf("Error for entry %s (%s) and member %lli (%s): %s\n", - osync_change_get_uid(status->change), - osync_objformat_get_name(osync_change_get_objformat(status->change)), - osync_member_get_id(status->member), - osync_member_get_pluginname(status->member), - osync_error_print(&(status->error))); + osync_change_get_uid(change), + osync_objformat_get_name(osync_change_get_objformat(change)), + osync_member_get_id(member), + osync_member_get_pluginname(member), + osync_error_print(&(error))); break; } osync_trace(TRACE_EXIT, "%s", __func__); } -static void mapping_status(OSyncMappingUpdate *status, void *user_data) +static void mapping_status(OSyncEngineMappingUpdate *status, void *user_data) { - switch (status->type) { - case OSYNC_MAPPING_EVENT_SOLVED: + + OSyncError *error = osync_engine_mapping_update_get_error(status); + + switch (osync_engine_mapping_update_get_event(status)) { + case OSYNC_ENGINE_MAPPING_EVENT_SOLVED: /*printf("Mapping solved\n");*/ break; - /*case OSYNC_MAPPING_EVENT_WRITTEN: - printf("Mapping Synced\n"); - break;*/ - case OSYNC_MAPPING_EVENT_ERROR: - printf("Mapping Error: %s\n", osync_error_print(&(status->error))); + case OSYNC_ENGINE_MAPPING_EVENT_ERROR: + printf("Mapping Error: %s\n", osync_error_print(&(error))); break; } } static void engine_status(OSyncEngineUpdate *status, void *user_data) { - switch (status->type) { + OSyncError *error = osync_engine_update_get_error(status); + + switch (osync_engine_update_get_event(status)) { case OSYNC_ENGINE_EVENT_CONNECTED: printf("All clients connected or error\n"); break; + case OSYNC_ENGINE_EVENT_CONNECT_DONE: + /* Not of interest for regular user. */ + break; case OSYNC_ENGINE_EVENT_READ: printf("All clients sent changes or error\n"); break; + case OSYNC_ENGINE_EVENT_MAPPED: + printf("All changes got mapped\n"); + break; + case OSYNC_ENGINE_EVENT_MULTIPLIED: + printf("All changes got multiplied\n"); + break; + case OSYNC_ENGINE_EVENT_PREPARED_WRITE: + printf("All changes got prepared for write\n"); + break; + case OSYNC_ENGINE_EVENT_PREPARED_MAP: + /* Not of interest for regular user. */ + break; case OSYNC_ENGINE_EVENT_WRITTEN: printf("All clients have written\n"); break; @@ -435,7 +462,7 @@ printf("All clients have disconnected\n"); break; case OSYNC_ENGINE_EVENT_ERROR: - printf("The sync failed: %s\n", osync_error_print(&(status->error))); + printf("The sync failed: %s\n", osync_error_print(&(error))); break; case OSYNC_ENGINE_EVENT_SUCCESSFUL: printf("The sync was successful\n"); @@ -449,6 +476,7 @@ case OSYNC_ENGINE_EVENT_SYNC_DONE: printf("All clients reported sync done\n"); break; + } } @@ -1371,7 +1399,6 @@ int main (int argc, char *argv[]) { OSyncError *error = NULL; - int i; char *groupname = NULL; char *membername = NULL; char *pluginname = NULL; |
