Nabble - Opensync - Dev

Re: osync_archive_save_ignored_conflict()

2009-11-08T09:16:46Z

On Sunday 08 November 2009 05:14:23 pm Daniel Gollub wrote:

> I guess it should look like this:
>
>
> ----8<---
> BEGIN TRANSACTION;
> CREATE TABLE tbl_changelog (objtype VARCHAR(64) NOT NULL, memberid INTEGER
> NOT NULL, mappingid INTEGER NOT NULL, changetype INTEGER NOT NULL, PRIMARY
> KEY (objtype, memberid, mappingid) );
> INSERT INTO "tbl_changelog" VALUES('contact',1,4,4);
> INSERT INTO "tbl_changelog" VALUES('contact',2,4,4);
> INSERT INTO "tbl_changelog" VALUES('contact',1,6,4);
> INSERT INTO "tbl_changelog" VALUES('contact',2,6,3);
> COMMIT;
> ---->8---
>

Find attachtd a proof of concept patch which is implementing this ...

--

archive/opensync_archive.c | 31 +++++++++++++++--------------
archive/opensync_archive_internals.h | 8 ++++---
engine/opensync_mapping_engine.c | 16 ++++++++++++++
engine/opensync_mapping_engine_internals.h | 1
engine/opensync_obj_engine.c | 12 +++++++----
mapping/opensync_mapping_entry_internals.h | 2 +
6 files changed, 48 insertions(+), 22 deletions(-)

---

Index: opensync/mapping/opensync_mapping_entry_internals.h
===================================================================
--- opensync/mapping/opensync_mapping_entry_internals.h (revision 5920)
+++ opensync/mapping/opensync_mapping_entry_internals.h (working copy)
@@ -47,4 +47,6 @@

/*@}*/

+long long int osync_mapping_entry_get_member_id(OSyncMappingEntry *entry);
+
#endif /*OPENSYNC_MAPPING_ENTRY_INTERNALS_H_*/
Index: opensync/archive/opensync_archive.c
===================================================================
--- opensync/archive/opensync_archive.c (revision 5926)
+++ opensync/archive/opensync_archive.c (working copy)
@@ -94,7 +94,7 @@
return TRUE;
}

- query = "CREATE TABLE tbl_changelog (objtype VARCHAR(64), id INTEGER, entryid INTEGER, changetype INTEGER, PRIMARY KEY (objtype, id) )";
+ query = "CREATE TABLE tbl_changelog (objtype VARCHAR(64) NOT NULL, memberid INTEGER NOT NULL, mappingid INTEGER NOT NULL, changetype INTEGER NOT NULL, PRIMARY KEY
(objtype, memberid, mappingid) )";
if (!osync_db_query(db, query, error)) {
goto error;
}
@@ -478,26 +478,27 @@
return FALSE;
}

-osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **ids, OSyncList **changetypes, OSyncError **error)
+osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **memberids, OSyncList **mappingids, OSyncList **changetypes,
OSyncError **error)
{
OSyncList *result = NULL, *row = NULL, *column = NULL;
char *query = NULL;
char *escaped_objtype = NULL;
- long long int id = 0;
+ long long int mappingid = 0, memberid = 0;
int changetype = 0;

- osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, archive, objtype, ids, error);
+ osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, archive, objtype, mappingids, error);

osync_assert(archive);
osync_assert(objtype);
- osync_assert(ids);
+ osync_assert(memberids);
+ osync_assert(mappingids);
osync_assert(changetypes);

if (!osync_archive_create_changelog(archive->db, objtype, error))
goto error;

escaped_objtype = osync_db_sql_escape(objtype);
- query = osync_strdup_printf("SELECT entryid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY id", escaped_objtype);
+ query = osync_strdup_printf("SELECT memberid, mappingid, changetype FROM tbl_changelog WHERE objtype='%s' ORDER BY mappingid", escaped_objtype);
osync_free(escaped_objtype);
escaped_objtype = NULL;
result = osync_db_query_table(archive->db, query, error);
@@ -511,13 +512,15 @@
for (row = result; row; row = row->next) {
column = row->data;

- id = g_ascii_strtoull(osync_list_nth_data(column, 0), NULL, 0);
- changetype = atoi(osync_list_nth_data(column, 1));
+ memberid = g_ascii_strtoull(osync_list_nth_data(column, 0), NULL, 0);
+ mappingid = atoi(osync_list_nth_data(column, 1));
+ changetype = atoi(osync_list_nth_data(column, 2));

- *ids = osync_list_append((*ids), GINT_TO_POINTER((int)id));
+ *memberids = osync_list_append((*memberids), GINT_TO_POINTER((int)memberid));
+ *mappingids = osync_list_append((*mappingids), GINT_TO_POINTER((int)mappingid));
*changetypes = osync_list_append((*changetypes), GINT_TO_POINTER((int)changetype));

- osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with entryid %lli", id);
+ osync_trace(TRACE_INTERNAL, "Loaded ignored mapping with mappingid %lli", mappingid);
}

osync_db_free_list(result);
@@ -529,11 +532,11 @@
return FALSE;
}

-osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int id, OSyncChangeType changetype, OSyncError **error)
+osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype,
OSyncError **error)
{
char *query = NULL;
char *escaped_objtype = NULL;
- osync_trace(TRACE_ENTRY, "%s(%p, %s, %lli, %p)", __func__, archive, objtype, id, error);
+ osync_trace(TRACE_ENTRY, "%s(%p, %s, %lli, %lli, %p)", __func__, archive, objtype, memberid, mappingid, error);

osync_assert(archive);
osync_assert(objtype);
@@ -542,7 +545,7 @@
goto error;

escaped_objtype = osync_db_sql_escape(objtype);
- query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id, changetype);
+ query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, memberid, mappingid, changetype) VALUES('%s', '%lli', '%lli', '%i')", escaped_objtype, memberid,
mappingid, changetype);
osync_free(escaped_objtype);
escaped_objtype = NULL;

@@ -553,7 +556,7 @@

osync_free(query);

- osync_trace(TRACE_EXIT, "%s: %lli", __func__, id);
+ osync_trace(TRACE_EXIT, "%s: %lli", __func__, mappingid);
return TRUE;

error:
Index: opensync/archive/opensync_archive_internals.h
===================================================================
--- opensync/archive/opensync_archive_internals.h (revision 5926)
+++ opensync/archive/opensync_archive_internals.h (working copy)
@@ -136,24 +136,26 @@
*
* @param archive The group archive
* @param objtype Requested object type
- * @param mappingsids List to store the archive (database) ids of each entry
+ * @param memberids List to store the member ids of each entry
+ * @param mappingsids List to store the mapping ids of each entry
* @param changetypes List to store the changetypes for each entry
* @param error Pointer to an error struct
* @return TRUE on when all changes successfully loaded otherwise FALSE
*/
-osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **mappingsids, OSyncList **changetypes, OSyncError **error);
+osync_bool osync_archive_load_ignored_conflicts(OSyncArchive *archive, const char *objtype, OSyncList **memberids, OSyncList **mappingsids, OSyncList **changetypes,
OSyncError **error);

/**
* @brief Saves an entry in the ignored conflict list.
*
* @param archive The group archive
* @param objtype Reported object type of entry
+ * @param memberid Member ID of entry
* @param mappingid Mapping Entry ID of entry
* @param changetype Changetype of entry
* @param error Pointer to an error struct
* @return Returns TRUE on success, FALSE otherwise
*/
-osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int mappingid, OSyncChangeType changetype, OSyncError **error);
+osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int memberid, long long int mappingid, OSyncChangeType changetype,
OSyncError **error);

/**
* @brief Deletes all ignored conflict entries of the changelog with the objtype.
Index: opensync/engine/opensync_mapping_engine.c
===================================================================
--- opensync/engine/opensync_mapping_engine.c (revision 5920)
+++ opensync/engine/opensync_mapping_engine.c (working copy)
@@ -126,6 +126,20 @@
}
}

+OSyncMappingEntryEngine *osync_mapping_engine_find_entry_by_memberid(OSyncMappingEngine *engine, long long int memberid)
+{
+ OSyncList *e;
+ for (e = engine->entries; e; e = e->next) {
+ OSyncMappingEntryEngine *entry = e->data;
+
+ if (osync_mapping_entry_get_member_id(entry->entry) == memberid)
+ return entry;
+ }
+
+ return NULL;
+}
+
+
static OSyncMappingEntryEngine *_osync_mapping_engine_find_entry(OSyncMappingEngine *engine, OSyncChange *change)
{
OSyncList *e;
@@ -620,7 +634,7 @@

for (c = engine->entries; c; c = c->next) {
OSyncMappingEntryEngine *entry = c->data;
- osync_archive_save_ignored_conflict(archive, objtype, id, osync_change_get_changetype(entry->change), error);
+ osync_archive_save_ignored_conflict(archive, objtype, osync_mapping_entry_get_member_id(entry->entry), id, osync_change_get_changetype(entry->change), error);
}

osync_status_update_mapping(engine->parent->parent, engine, OSYNC_ENGINE_MAPPING_EVENT_SOLVED, NULL);
Index: opensync/engine/opensync_obj_engine.c
===================================================================
--- opensync/engine/opensync_obj_engine.c (revision 5938)
+++ opensync/engine/opensync_obj_engine.c (working copy)
@@ -767,8 +767,8 @@

static osync_bool _inject_changelog_entries(OSyncObjEngine *engine, OSyncError **error) {
OSyncList *ids = NULL;
- OSyncList *changetypes = NULL;
- OSyncList *j = NULL, *t = NULL;
+ OSyncList *changetypes = NULL, *memberids = NULL;
+ OSyncList *j = NULL, *t = NULL, *mid = NULL;

osync_trace(TRACE_ENTRY, "%s(%p)", __func__, engine);

@@ -776,12 +776,13 @@
osync_assert(engine->archive);
osync_assert(engine->objtype);

- if (!osync_archive_load_ignored_conflicts(engine->archive, engine->objtype, &ids, &changetypes, error)) {
+ if (!osync_archive_load_ignored_conflicts(engine->archive, engine->objtype, &memberids, &ids, &changetypes, error)) {
osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
return FALSE;
}

t = changetypes;
+ mid = memberids;
for (j = ids; j; j = j->next) {
long long int id = (long long int)GPOINTER_TO_INT(j->data);

@@ -793,8 +794,10 @@

if (mapping_engine->mapping == ignored_mapping) {
OSyncList *m;
+
for (m = mapping_engine->entries; m; m = m->next) {
- OSyncMappingEntryEngine *entry = m->data;
+ long long int memberid = (long long int)GPOINTER_TO_INT(mid->data);
+ OSyncMappingEntryEngine *entry = osync_mapping_engine_find_entry_by_memberid(mapping_engine, memberid);
OSyncChangeType changetype = (OSyncChangeType) t->data;
OSyncChange *ignored_change = osync_change_new(error);
OSyncObjFormat *dummyformat = NULL;
@@ -817,6 +820,7 @@
}

t = t->next;
+ mid = mid->next;
}

osync_list_free(ids);
Index: opensync/engine/opensync_mapping_engine_internals.h
===================================================================
--- opensync/engine/opensync_mapping_engine_internals.h (revision 5920)
+++ opensync/engine/opensync_mapping_engine_internals.h (working copy)
@@ -65,6 +65,7 @@
osync_bool osync_mapping_engine_check_conflict(OSyncMappingEngine *engine);

OSyncMappingEntryEngine *osync_mapping_engine_get_entry(OSyncMappingEngine *engine, OSyncSinkEngine *sinkengine);
+OSyncMappingEntryEngine *osync_mapping_engine_find_entry_by_memberid(OSyncMappingEngine *engine, long long int memberid);

OSYNC_TEST_EXPORT unsigned int osync_mapping_engine_num_changes(OSyncMappingEngine *engine);

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: osync_archive_save_ignored_conflict()

2009-11-08T08:14:23Z

On Saturday 07 November 2009 12:58:38 am Chris Frey wrote:

> Hi,
>
> In the opensync_archive_internals.h header, _save_ignored_conflict()
> is documented as such:
>
> /**
> * @brief Saves an entry in the ignored conflict list.
> *
> * @param archive The group archive
> * @param objtype Reported object type of entry
> * @param mappingid Mapping Entry ID of entry

That's correct.

> * @param changetype Changetype of entry
> * @param error Pointer to an error struct
> * @return Returns TRUE on success, FALSE otherwise
> */
> osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const
> char *objtype, long long int mappingid, OSyncChangeType changetype,
> OSyncError **error);
>
>
> In opensync_archive.c, it is implemented like this:
>
> osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const
> char *objtype, long long int id, OSyncChangeType changetype, OSyncError
> **error) {
> [...]

maybe we should sync this up with the other declaration and call it "mappingid".

>
> query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype,
> entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id,
> changetype);

The tbl_changelog is indeed very confusing. There is one column left-over we
doesn't us at all: "id"

And the "entryid" is also very confusing.

>
> ...
>
>
> Isn't the entryid field used for the archive id's themselves, and not the
> mapping ids?

Not quite sure which ID you mean for "archive id".

FYI, the tbl_changelog is only used for handling "ignored" conflicts ...
tbl_changes is used to store the "mappings".
tbl_archive stores only the entire entries of a change when merger/demerge
gets used.

While looking into this i found a bug in OpenSync which broke the support
of "ignore conflicts". Which is hopefully fixed now with r5950

Here is a dump of the tbl_changes and tbl_changelog, which contains two
conflicts which got ignored. (I used for that a group with two file-sync members)

----8<----
BEGIN TRANSACTION;
CREATE TABLE tbl_changes (objtype VARCHAR(64) NOT NULL, id INTEGER PRIMARY KEY AUTOINCREMENT, uid VARCHAR NOT NULL, memberid INTEGER NOT NULL, mappingid INTEGER NOT NULL,
objengine VARCHAR(64) NOT NULL );
INSERT INTO "tbl_changes" VALUES('contact',67,'foo0',2,1,'contact');
INSERT INTO "tbl_changes" VALUES('contact',68,'foo3',2,2,'contact');
INSERT INTO "tbl_changes" VALUES('contact',69,'foo1',2,3,'contact');
INSERT INTO "tbl_changes" VALUES('contact',70,'test1.vcard',2,4,'contact');
INSERT INTO "tbl_changes" VALUES('contact',71,'foo5',2,5,'contact');
INSERT INTO "tbl_changes" VALUES('contact',72,'foo8',2,6,'contact');
INSERT INTO "tbl_changes" VALUES('contact',73,'foo4',2,7,'contact');
INSERT INTO "tbl_changes" VALUES('contact',74,'foo2',2,8,'contact');
INSERT INTO "tbl_changes" VALUES('contact',75,'foo6',2,9,'contact');
INSERT INTO "tbl_changes" VALUES('contact',76,'foo7',2,10,'contact');
INSERT INTO "tbl_changes" VALUES('contact',77,'foo9',2,11,'contact');
INSERT INTO "tbl_changes" VALUES('contact',78,'foo0',1,1,'contact');
INSERT INTO "tbl_changes" VALUES('contact',79,'foo3',1,2,'contact');
INSERT INTO "tbl_changes" VALUES('contact',80,'foo1',1,3,'contact');
INSERT INTO "tbl_changes" VALUES('contact',81,'test1.vcard',1,4,'contact');
INSERT INTO "tbl_changes" VALUES('contact',82,'foo5',1,5,'contact');
INSERT INTO "tbl_changes" VALUES('contact',84,'foo4',1,7,'contact');
INSERT INTO "tbl_changes" VALUES('contact',85,'foo2',1,8,'contact');
INSERT INTO "tbl_changes" VALUES('contact',86,'foo6',1,9,'contact');
INSERT INTO "tbl_changes" VALUES('contact',87,'foo7',1,10,'contact');
INSERT INTO "tbl_changes" VALUES('contact',88,'foo9',1,11,'contact');
COMMIT;
dgollub@marvin:~> sqlite3 .config/opensync/0.40/group1/archive.db ".dump tbl_changelog"
BEGIN TRANSACTION;
CREATE TABLE tbl_changelog (objtype VARCHAR(64), id INTEGER, entryid INTEGER, changetype INTEGER, PRIMARY KEY (objtype, id) );
INSERT INTO "tbl_changelog" VALUES('contact',NULL,4,4);
INSERT INTO "tbl_changelog" VALUES('contact',NULL,4,4);
INSERT INTO "tbl_changelog" VALUES('contact',NULL,6,4);
INSERT INTO "tbl_changelog" VALUES('contact',NULL,6,3);
COMMIT;
---->8---

(changetypes: 3 == deleted, 4 == modified)

And indeed this looks pretty strange - 4 tbl_changelog for 2 mappings ...

The information is missing which member was sending which changetype ...

I guess it should look like this:

----8<---
BEGIN TRANSACTION;
CREATE TABLE tbl_changelog (objtype VARCHAR(64) NOT NULL, memberid INTEGER NOT NULL, mappingid INTEGER NOT NULL, changetype INTEGER NOT NULL, PRIMARY KEY (objtype, memberid,
mappingid) );
INSERT INTO "tbl_changelog" VALUES('contact',1,4,4);
INSERT INTO "tbl_changelog" VALUES('contact',2,4,4);
INSERT INTO "tbl_changelog" VALUES('contact',1,6,4);
INSERT INTO "tbl_changelog" VALUES('contact',2,6,3);
COMMIT;
---->8---

Does this sound sane?
Does this address your question?

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

osync_archive_save_ignored_conflict()

2009-11-06T15:58:38Z

Hi,

In the opensync_archive_internals.h header, _save_ignored_conflict()
is documented as such:

/**
* @brief Saves an entry in the ignored conflict list.
*
* @param archive The group archive
* @param objtype Reported object type of entry
* @param mappingid Mapping Entry ID of entry
* @param changetype Changetype of entry
* @param error Pointer to an error struct
* @return Returns TRUE on success, FALSE otherwise
*/
osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int mappingid, OSyncChangeType changetype, OSyncError **error);

In opensync_archive.c, it is implemented like this:

osync_bool osync_archive_save_ignored_conflict(OSyncArchive *archive, const char *objtype, long long int id, OSyncChangeType changetype, OSyncError **error)
{
[...]

query = osync_strdup_printf("INSERT INTO tbl_changelog (objtype, entryid, changetype) VALUES('%s', '%lli', '%i')", escaped_objtype, id, changetype);

...

Isn't the entryid field used for the archive id's themselves, and not the
mapping ids?

Thanks,
- Chris

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: wrong tagging

2009-11-06T08:10:23Z

On Friday 06 November 2009 05:00:01 pm Michael Bell wrote:
> I discovered during svn update that the cmake directory of released
> versions in osynctool/tags is a external link. This is a bug. If you
> release a source then all content of the release must be static.
>
> I fixed this for libsyncml a while ago. It is just a question of a
> better documentation. I don't checked this for libopensync. I just
> discovered the issue two minutes ago.
>

This is fixed for all newly created tags. A post-commit hook will pin
externals to the revision when it got tagged.

Just did a test-tag to demonstrate the post-commit hook:

http://opensync.org/changeset/5947
http://opensync.org/changeset/5948 (commit by the hook to pin the
svn:Externals property)

Michael, i already asked this on an OpenSync ticket, do you want to have the
same post-commit hook installed in libsyncml and libwbxml2 Subversion?
The hook gets active as soon you copy a direcotry into */tags/$ ... the commit
takes a bit longer since on the subvesrion hosts an entire checkout of the tag
needs to be done to modify all externals properties ...

Check: http://people.b1-systems.de/~gollub/pin-external-on-tag.sh

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

wrong tagging

2009-11-06T08:00:01Z

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I discovered during svn update that the cmake directory of released
versions in osynctool/tags is a external link. This is a bug. If you
release a source then all content of the release must be static.

I fixed this for libsyncml a while ago. It is just a question of a
better documentation. I don't checked this for libopensync. I just
discovered the issue two minutes ago.

Best regards

Michael
- --
___________________________________________________________________

Michael Bell Humboldt-Universitaet zu Berlin

Tel.: +49 (0)30-2093 2482 ZE Computer- und Medienservice
Fax: +49 (0)30-2093 2704 Unter den Linden 6
michael.bell@... D-10099 Berlin
___________________________________________________________________

PGP Fingerprint: 09E4 3D29 4156 2774 0F2C C643 D8BD 1918 2030 5AAB
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkr0R/0ACgkQ2L0ZGCAwWqutLACgvem58cxp2OAvWVvyExZ30M8N
5rsAnioLjKYLiHVTAaanxWfjR25fICti
=Cs3Y
-----END PGP SIGNATURE-----

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: Fixed SyncML plugin commit limitation and reenabled pending limit in OpenSync

2009-11-06T03:49:56Z

On Friday 06 November 2009 12:46:09 pm Michael Bell wrote:
> Does OpenSync trunk works?

Yes.

Only the merging and capabilities stuff is not completed.
And the XMLFormat and vformat plugin still lacking some fields ...

>
> If yes, then I would migrate the SyncML plugin to libsyncml trunk on the
> weekend. Additionally I would like to branch the actual code to have a
> maintainable libsyncml 0.5.x port. My problem is that I don't know where
> to place such a branch.

I'll take care about that...
We already planned to have a trunk/branches/tags direcotry hierachy for
plugins. Will do that for SyncML plugin now.

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: Fixed SyncML plugin commit limitation and reenabled pending limit in OpenSync

2009-11-06T03:46:09Z

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Daniel,

Daniel Gollub wrote:

> The SyncML plugin is now able to write more then 4 entries without exceeding
> the pending limit and without deadlocking. Just committed approx. 50 entries
> at once to my test mobile (SyncML Data-Sync server implementation only
> tested):
> http://opensync.org/changeset/5941

Does OpenSync trunk works?

If yes, then I would migrate the SyncML plugin to libsyncml trunk on the
weekend. Additionally I would like to branch the actual code to have a
maintainable libsyncml 0.5.x port. My problem is that I don't know where
to place such a branch.

Best regards

Michael
- --
___________________________________________________________________

Michael Bell Humboldt-Universitaet zu Berlin

Tel.: +49 (0)30-2093 2482 ZE Computer- und Medienservice
Fax: +49 (0)30-2093 2704 Unter den Linden 6
michael.bell@... D-10099 Berlin
___________________________________________________________________

PGP Fingerprint: 09E4 3D29 4156 2774 0F2C C643 D8BD 1918 2030 5AAB
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEUEARECAAYFAkr0DH4ACgkQ2L0ZGCAwWqtcHACdHsfzXH0vV7CP6qSu+HrlS3tb
GLUAmOcG43lotXQI4ofFTE4EmwlHg5o=
=8Z+w
-----END PGP SIGNATURE-----

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Fixed SyncML plugin commit limitation and reenabled pending limit in OpenSync (was: Re: [trunk] Introduced osync_context_report_uid_update() in sync_done() phase)

2009-11-05T12:34:43Z

Hi,

On Thursday 05 November 2009 05:40:29 pm Daniel Gollub wrote:
[...]
> This issue solves a well known problem of the SyncML plugin and the
> OpenSync IPC by deadlocking after 4 entries in a row get written to the
> SyncML-peer. This is not yet implemented in the SyncML plugin.
[...]

just reenabled the pending limit in OpenSync:
http://opensync.org/changeset/5942

http://opensync.org/changeset/5858 was there a ticket for this change?

The SyncML plugin is now able to write more then 4 entries without exceeding
the pending limit and without deadlocking. Just committed approx. 50 entries
at once to my test mobile (SyncML Data-Sync server implementation only
tested):
http://opensync.org/changeset/5941

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

[trunk] Introduced osync_context_report_uid_update() in sync_done() phase

2009-11-05T08:40:29Z

Hi,

just implemented the osync_context_report_uid_update() function for sync-
plugins.

This functions allows to support protocols or synchronization-interfaces which
replace the initial UID after the change got comitted/written, and report them
after all changes got written.

There are already lots of plugins which overwrite the UID of an OSyncChange
during the commit() function. But this works only for protocols/interfaces
which provide the new UID immediately after the single write of a change.

Protocols like SyncML for example, maybe there are others as well, which
provide the information about a "mapping update" (or changed UIDs of just
written entries) after all changes got written.

Now we can handle this flawless with the introduction of
osync_context_report_uid_update().

Plugins can now call this function in the sync_done() function and report all
updated UIDs, by just providing the old-UID and the new-UID. OpenSync will
take care the mapping of the right entries doesn't get lost. OpenSync also
updates this information inside the hashtable - if used.

The interface looks like this:

void osync_context_report_uid_update(OSyncContext *ctx,
const char *olduid, const char *newuid);

This issue solves a well known problem of the SyncML plugin and the OpenSync
IPC by deadlocking after 4 entries in a row get written to the SyncML-peer.
This is not yet implemented in the SyncML plugin.

For more information see http://opensync.org/ticket/1161

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: osync_engine_mapping_ignore_conflict and osync_bool osync_engine_mapping_use_latest

2009-11-03T04:52:15Z

On Tuesday 03 November 2009 01:18:24 pm Henrik /KaarPoSoft wrote:
> See also http://opensync.org/ticket/1185
>
> Can anybody explain what a plugin has to do in order to support those
> two conflict solutions?
>

I replied in the ticket-system.

Quick Summary:

To support conflict handler "ignore": plugins need to implement the plugin
sink function: "read" (!= get_changes)

To support conflict handler use_latest .. the format plugins need to implement
the "revision" function.

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

osync_engine_mapping_ignore_conflict and osync_bool osync_engine_mapping_use_latest

2009-11-03T04:18:24Z

Dear all,

It seems that osync_engine_mapping_ignore_conflict and osync_bool
osync_engine_mapping_use_latest can only be used if the plugin works in
a certain way.

See also http://opensync.org/ticket/1185

Can anybody explain what a plugin has to do in order to support those
two conflict solutions?

Thanks in advance,
Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-02T04:56:13Z

On Monday 02 November 2009 12:25:07 am Graham Cobb wrote:
> I have checked in my changes for the external plugin config file (r5906).

Thanks a lot!

> Things still left to do (most important first):
>
> 1) Unit tests for the new code

Created a ticket for that:
http://opensync.org/ticket/1184

>
> 2) ExternalCommand support.

Implemented:
http://opensync.org/changeset/5914

>
> 3) Validation against XSD.

This is next on my TODO list ...

>
> As I mentioned, I am travelling on business for the next few weeks. I
> probably won't get much time to look at this (or the timeout stuff) while
> I am away.
>

Ok, i'll concentrate on the timeout stuff once the extenral stuff is completed
(very likely after the XSD got written). I need to introduce some more
interface for mapping update ... once this is done we can reenable the IPC
pendingLimit ... see http://opensync.org/ticket/1161

Thanks for your core contribution! ;)
Wish you a safe trip!

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T15:25:07Z

Daniel,

I have checked in my changes for the external plugin config file (r5906).
Things still left to do (most important first):

1) Unit tests for the new code

2) ExternalCommand support.

3) Validation against XSD.

As I mentioned, I am travelling on business for the next few weeks. I
probably won't get much time to look at this (or the timeout stuff) while I
am away.

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T15:00:41Z

On Sunday 01 November 2009 13:32:57 Daniel Gollub wrote:
> On Sunday 01 November 2009 01:39:24 am Graham Cobb wrote:
> > 1) When I run the unittests, 17 of them fail. I don't think any of them
> > are related to these changes but is that expected at the moment?
>
> No, actually they should fail.
>
> Could you run: "make Experimental" so the testing resutls get uploaded to
> the CDash dashboard .. so we can have a look on the logs?

I reverted my changes and re-ran the tests. I got 18 failures. I ran make
Experimental but I haven't had time to investigate the failures. I note that
most of them failed with:

/home/Linux/opensync/trunk/tests/mock-plugin/mock_sync.c:241:E:mock_write:
Assertion "!g_file_test(filename, G_FILE_TEST_EXISTS)" failed

Any ideas?

Given that the same errors occur with or without my changes I am going to
check in my changes anyway.

By the way, I normally only run "make test" as I sort of presumed you didn't
want the dashboard full of random tests of developers while they are
debugging their code. What are the guidelines for when we should run make
Experimental?

I find the CTest verbose logs fairly uninformative in many cases. Is there
any way to use gdb to step through the test case code (and/or to debug the
OpenSync code)?

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T11:05:54Z

Just a quick email reply for now -- hopefully I will get some time to actually
work on this later today.

On Sunday 01 November 2009 13:32:57 Daniel Gollub wrote:
> On Sunday 01 November 2009 01:39:24 am Graham Cobb wrote:
> > I have a first cut of the external plugin config file ready to check in
> > (http://opensync.pastebin.com/m38d98a95).
>
> Thanks, will review your patch ASAP!

Thanks for your feedback, including in your other emails.

> > 1) When I run the unittests, 17 of them fail. I don't think any of them
> > are related to these changes but is that expected at the moment?

> > If it is not expected I will have to do some more checking.
>
> Would be great if you could check whats going wrong there ...
> Those tests also fail if you revert your changes - right?

That is the first step in the "more checking" :-) I will look into this later
this evening.

> > 2) I have created an example external plugin config file in
> > docs/examples/plugins/src. Can the existing CMake macros be used to get
> > that file installed into the plugin directory (which is where I am
> > looking for it -- I look for .xml files first, then .so files)? I
> > haven't tried it but I assume the macros like OPENSYNC_PLUGIN_INSTALL
> > expect a .so file.

> I'll introduce a cmake macro called "OPENSYNC_EXTERNAL_PLUGIN_INSTALL" ...

Thanks, I will use that.

> > 3) The XML format includes <ExternalCommand> but I currently ignore
> > it. My plan is that this should be saved in the plugin structure and
> > could be used as a default for the config option that Henrik is adding.
>
> Ok, fine with me.

I saw your other email on this. I will try to get to this today but may not
have time. I want to concentrate on getting the basic code working and
tested.

> > 4) If the .xml and the .so are both present, they both get loaded and two
> > plugins exist with the same name. I thought of adding error checking to
> > osync_plugin_set_name to fail if a plugin of the same name is already
> > loaded. But I have just noticed that none of the osync_plugin_set_...
> > calls have OSyncError parameters. Should they? This would be an API
> > change (to a widely used API).

> Anyway, this is a different issue - independent of your planned changes ..
> which should get fixed at some point. I'll create for that a ticket ... in
> my opionoen it's not a blocker, since this could be avoided by distribution
> with sane packaging ;)

OK. I am not going to worry about this at the moment.

>From your other email:

> Is the drop of osync_module_unload() intended?

Yes, it is necessary. The pseudo-plugin created by the new external plugin
code has no module->module (it is NULL). That seems reasonable to me as no
module has been loaded. The only place that gets upset by this is
osync_module_unload() which asserts that module->module exists. That also
seems reasonable to me: you shouldn't be trying to unload a module if one was
never loaded.

Fortunately, osync_module_unref() already unloads the module if this is the
last reference and if module->module is non-null (i.e. a module was actually
loaded). So, it is never necessary to call osync_module_unload()
explicitly -- it will be unloaded automatically when the last reference is
dropped.

In fact, I would even argue it is a bug: the caller does not know that someone
else does not hold a reference and the module should not be unloaded until
the last reference is dropped.

So, yes it is deliberate. The change to the comment was supposed to give a
hint!

As for ignoring the error on loading the external plugin, you are right that I
did it because that is the way the existing plugin code worked. You are also
right that we should probably be making the error visible somewhere other
than the trace files and if we *really* want to ignore it we should be
freeing the error struct. I will add the FIXME.

You mention that you will write an XSD (thanks -- another thing I have never
done!). Should I validiate the XML file against the XSD before loading it?
I noticed that some other code (can't remember what, offhand, maybe config
file loading?) does that.

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

mozilla-sync - now with OSYNC_START_TYPE_EXTERNAL

2009-11-01T10:17:50Z

Until now, the mozilla-sync plugin has been running inside the OpenSync
process, and accessing the mozilla data in a non-thread-safe way.

The mozilla-sync plugin is now replaced by a simple stub, running with
OSYNC_START_TYPE_EXTERNAL

This means, that the bulk of the work is now done in the blueZync
plugin, by calling thunderbird --mozilla-sync /path/to/pipe

The implementation is still not thread-safe, but with the threading
capabilities of Thunderbird 3, it will be possible to make a thread-safe
implementation for Thunderbird 3.

http://bluezync.svn.sourceforge.net/viewvc/bluezync?view=rev&revision=481
and
http://opensync.org/log/plugins/mozilla-sync/trunk/src?rev=5901**
implements this behaviour.

(However, it currently only works for Thunderbird address-books, not for
sunbird and lightning. Also, it will not work with Debian ice*)

Build instructions:
http://bluezync.kaarposoft.dk/building.html

/Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T07:46:04Z

On Sunday 01 November 2009 01:39:24 am Graham Cobb wrote:
> 3) The XML format includes <ExternalCommand> but I currently ignore
> it. My plan is that this should be saved in the plugin structure and
> could be used as a default for the config option that Henrik is adding.
>

I reserved a place in the code where you could make use of the ExternalCommand
form the XML EXternal Plugin file ...

See:
http://opensync.org/changeset/5898/trunk/opensync/engine/opensync_engine.c

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

[trunk] ExternalCommand in the plugin configuration file

2009-11-01T06:35:03Z

Plugins of type OSYNC_START_TYPE_EXTERNAL needs to be able to spawn an
external command to run the actual plugin code.

SVN -r 5896 allows a member to set an ExternalCommand in the plugin
configuration file.
This command will be executed by the proxy to start up the external process.

The external_command should be a string in printf format, with one %s.
Before the command is executed, a variant of printf will be called
to replace the %s with the path to the plugin pipe.

Example:
<ExternalPlugin>
<ExternalCommand>thunderbird -mozilla-sync %s</ExternalCommand>
</ExternalPlugin>

Added to public API:
osync_plugin_config_get_externalplugin
osync_plugin_config_set_externalplugin
osync_plugin_externalplugin_new
osync_plugin_externalplugin_unref
osync_plugin_externalplugin_ref
osync_plugin_externalplugin_get_external_command
osync_plugin_externalplugin_set_external_command
(as well as the changed format for the plugin configuration file)

Changed internal interface:
From
osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy,
OSyncStartType type, const char *path, OSyncError **error)
To
osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy,
OSyncStartType type, const char *path, const char* external_command,
OSyncError **error)

/Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T06:07:32Z

On Sunday 01 November 2009 01:39:24 am Graham Cobb wrote:
> I have a first cut of the external plugin config file ready to check in
> (http://opensync.pastebin.com/m38d98a95). But I have a couple of
> questions:
>

------8<-----
@@ -69,9 +71,8 @@
env->plugins = osync_list_remove(env->plugins, env-
>plugins->data);
}

- /* Unload all modules */
+ /* Unref (and so unload) all modules */
while (env->modules) {
- osync_module_unload(env->modules->data);
osync_module_unref(env->modules->data);
env->modules = osync_list_remove(env->modules, env-
>modules->data);
}
----->8----

Is the drop of osync_module_unload() intended?

---------8<----------
@@ -117,6 +119,31 @@
[...]
+ if (!osync_plugin_env_load_module_xml(env, filename, error)) {
+ osync_trace(TRACE_ERROR, "Unable to load module: %s",
osync_error_print(error));
+ }
+
+ osync_free(filename);
[...]
---------->8--------------

You ignore the error, like it was done for the loading the shared-module
plugins - right? Or is there any specific reason for that?

We should place here (and for the same place for shared-modules loading) a
FIXME .. since we're leaking here a OSyncError-struct if an error get set.
And also problems of loading a plugin is not visible as long you don't look
into trace-files ... but that shouldn't block to apply your patch. I'll
create a ticket for that issue ...

Beside that this looks pretty perfect to me. I'll write a XSD (XML-Schema)
for your XML file.

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [RFC][PATCH] External command in plugin configuration file

2009-11-01T05:52:22Z

On Saturday 31 October 2009 11:01:33 am Henrik /KaarPoSoft wrote:
> Following Daniel's checkin of the client and example code for external
> plugin, here is a patch (on -r5895) which allows a member to set an
> ExternalCommand in the plugin configuration file. This command will be
> executed by the proxy to start up the external process.
>
> Your comments would be most appreciated.
>

One questions regarding the API:

osync_member_get_external_command()

Is there any reason to export this function to the public API? Our goal should
be to have only a small number of public API interfaces .. so it's easier to
maintain and to keep the API stable .. currently i don't see any reason to put
this inside opensync_member.h

Instead i would suggest to move this into osync_member_internals.h and use
OSYNC_TEST_EXPORT instead .. not OSYNC_EXPORT. So this function is still
avaibale for the osync_engine.c code and for unittests...

Beside this the patch looks pretty good to me ...

JFYI, we have a unit test to avoid API breaks - if you add new public
Interfaces you need to modifiy following file: trunk/opensync.sym

Just add by hand the function name - sorted. And test with:
ctest -R symbol -V

Currently it fails with your patch, due to missing entries:

-----8<----
332a333
> osync_member_get_external_command <------------- IGNORE this!
513a515
> osync_plugin_config_get_externalplugin
522a525
> osync_plugin_config_set_externalplugin
568a572,576
> osync_plugin_externalplugin_get_external_command
> osync_plugin_externalplugin_new
> osync_plugin_externalplugin_ref
> osync_plugin_externalplugin_set_external_command
> osync_plugin_externalplugin_unref
-- Process completed
***Failed

0% tests passed, 1 tests failed out of 1

The following tests FAILED:
1 - symbols (Failed)
------->8----

So you need to add follwing lines to opensync.sym:

osync_plugin_config_get_externalplugin
osync_plugin_config_set_externalplugin

osync_plugin_externalplugin_get_external_command
osync_plugin_externalplugin_new
osync_plugin_externalplugin_ref
osync_plugin_externalplugin_set_external_command
osync_plugin_externalplugin_unref

Please move osync_member_get_external_command() to opensync_member_internals.h
and adapt opensync.sym commit your modifications.

Thanks for your contribution!

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-11-01T05:32:57Z

On Sunday 01 November 2009 01:39:24 am Graham Cobb wrote:
> I have a first cut of the external plugin config file ready to check in
> (http://opensync.pastebin.com/m38d98a95).

Thanks, will review your patch ASAP!

> But I have a couple of
> questions:
>
> 1) When I run the unittests, 17 of them fail. I don't think any of them
> are related to these changes but is that expected at the moment?

No, actually they should fail.

Could you run: "make Experimental" so the testing resutls get uploaded to the
CDash dashboard .. so we can have a look on the logs?

http://opensync.org/testing/index.php?project=OpenSync

>
> The following tests FAILED:
[...]

JFYI, you can also run those tests with:

ctest -V

-V makes things more verbose ...

If you only want to run specific tests you can use -R $regex to run only
specifc tests - e.g.:

ctest -V -R sync_

Will run all tests including "sync_"

>
> If it is not expected I will have to do some more checking.

Would be great if you could check whats going wrong there ...
Those tests also fail if you revert your changes - right?

>
> 2) I have created an example external plugin config file in
> docs/examples/plugins/src. Can the existing CMake macros be used to get
> that file installed into the plugin directory (which is where I am
> looking for it -- I look for .xml files first, then .so files)? I haven't
> tried it but I assume the macros like OPENSYNC_PLUGIN_INSTALL expect a .so
> file.

OSYNC_PLUGIN_INSTALL is quite simple ... it doesn't check for *.so

-----8<----
## Install plugin
MACRO( OPENSYNC_PLUGIN_INSTALL _pluginName )
INSTALL( TARGETS ${_pluginName} DESTINATION ${OPENSYNC_PLUGINDIR} )
ENDMACRO( OPENSYNC_PLUGIN_INSTALL )
---->8------

So you could point this to a .xml file ... but maybe we should introduce a new
macro for such configuration file. Maybe one day we want to change the
location of this kind config file .. so we just need to change the central
macro, and don't have to fix all plugins. What do you think?

>
> I really don't know CMake -- can anyone advise how to get my .xml file
> installed into the plugin directory?

I'll introduce a cmake macro called "OPENSYNC_EXTERNAL_PLUGIN_INSTALL" ...

>
> The new code seems to work but there are a few things that still need to
> be done:
>
> 3) The XML format includes <ExternalCommand> but I currently ignore
> it. My plan is that this should be saved in the plugin structure and
> could be used as a default for the config option that Henrik is adding.

Ok, fine with me.

>
> 4) If the .xml and the .so are both present, they both get loaded and two
> plugins exist with the same name. I thought of adding error checking to
> osync_plugin_set_name to fail if a plugin of the same name is already
> loaded. But I have just noticed that none of the osync_plugin_set_...
> calls have OSyncError parameters. Should they? This would be an API
> change (to a widely used API).

Actually the file-name of a plugin doesn't have to be the name of the plugin
in the Plugin Enviroment. e.g.: syncml.so spawns 4 plugins, non called
"syncml".

But i see your point with osync_plugin_set_name() .. and having multiple
plugins with the same name. This problem is already present ... even without
your modification.

What we could do, without breaking the api to handle this:

We could let osync_plugin_env_load() fail if there are multiple plugins with
the same name in the env->plugins list. Or we could let
osync_plugin_env_register_plugin() fail ... but this function get called by
the plugins any maybe not get handled by the plugin. We could do checks in
both function to be sure ...

Anyway, this is a different issue - independent of your planned changes ..
which should get fixed at some point. I'll create for that a ticket ... in my
opionoen it's not a blocker, since this could be avoided by distribution with
sane packaging ;)

>
> 5) There is no unittest for this code yet.
>
> I'm not sure if I will get time to work on this further on Sunday -- I
> will check it in by the end of Sunday.
>

Ok, cool. Thanks for your contribution!

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-10-31T17:39:24Z

On Friday 30 October 2009 21:49:22 Daniel Gollub wrote:
> Currently, there is need of stub plugin, which registers the plugin to the
> OpenSync environment. As Graham already suggested in a seperated thread,
> we'll very likely change it - so there is only need to write a simple
> configuration file to register external plugins.

I have a first cut of the external plugin config file ready to check in
(http://opensync.pastebin.com/m38d98a95). But I have a couple of questions:

1) When I run the unittests, 17 of them fail. I don't *think* any of them are
related to these changes but is that expected at the moment?

The following tests FAILED:
36 - filter_sync_deny_all (Failed)
176 - lock_dual_sync_engine_lock (Failed)
206 - mapping_engine_same_similar_conflict (Failed)
207 - mapping_engine_same_similar_conflict2 (Failed)
208 - mapping_engine_same_similar_conflict_multi (Failed)
227 - multisync_dual_new (Failed)
228 - multisync_triple_new (Failed)
239 - multisync_conflict_data_duplicate (Failed)
240 - multisync_conflict_data_duplicate2 (Failed)
246 - sync_easy_conflict (Failed)
247 - sync_easy_new_mapping (Failed)
248 - sync_easy_conflict_duplicate (Failed)
249 - sync_easy_conflict_abort (Failed)
250 - sync_conflict_duplicate2 (Failed)
251 - sync_conflict_delay (Failed)
256 - sync_large (Failed)
261 - sync_initial_slow_sync (Failed)

If it is not expected I will have to do some more checking.

2) I have created an example external plugin config file in
docs/examples/plugins/src. Can the existing CMake macros be used to get that
file installed into the plugin directory (which is where I am looking for
it -- I look for .xml files first, then .so files)? I haven't tried it but I
assume the macros like OPENSYNC_PLUGIN_INSTALL expect a .so file.

I really don't know CMake -- can anyone advise how to get my .xml file
installed into the plugin directory?

The new code seems to work but there are a few things that still need to be
done:

3) The XML format includes <ExternalCommand> but I currently ignore it. My
plan is that this should be saved in the plugin structure and could be used
as a default for the config option that Henrik is adding.

4) If the .xml and the .so are both present, they both get loaded and two
plugins exist with the same name. I thought of adding error checking to
osync_plugin_set_name to fail if a plugin of the same name is already loaded.
But I have just noticed that none of the osync_plugin_set_... calls have
OSyncError parameters. Should they? This would be an API change (to a
widely used API).

5) There is no unittest for this code yet.

I'm not sure if I will get time to work on this further on Sunday -- I will
check it in by the end of Sunday.

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

[RFC][PATCH] External command in plugin configuration file

2009-10-31T03:01:33Z

Dear all,

Following Daniel's checkin of the client and example code for external
plugin, here is a patch (on -r5895) which allows a member to set an
ExternalCommand in the plugin configuration file. This command will be
executed by the proxy to start up the external process.

Your comments would be most appreciated.

/Henrik

Index: misc/schemas/plugin_config.xsd
===================================================================
--- misc/schemas/plugin_config.xsd (revision 5895)
+++ misc/schemas/plugin_config.xsd (working copy)
@@ -9,6 +9,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="Connection" type="Connection"/>
<xsd:element maxOccurs="1" minOccurs="0" name="Localization" type="Localization"/>
<xsd:element maxOccurs="1" minOccurs="0" name="Resources" type="Resources"/>
+ <xsd:element maxOccurs="1" minOccurs="0" name="ExternalPlugin" type="ExternalPlugin"/>
</xsd:sequence>
<xsd:attribute name="version" type="xsd:string"/>
</xsd:complexType>
@@ -164,4 +165,10 @@
</xsd:all>
</xsd:complexType>

+ <xsd:complexType name="ExternalPlugin">
+ <xsd:all>
+ <xsd:element maxOccurs="1" minOccurs="1" name="ExternalCommand" type="xsd:string" />
+ </xsd:all>
+ </xsd:complexType>
+
</xsd:schema>
Index: opensync/opensync-plugin.h
===================================================================
--- opensync/opensync-plugin.h (revision 5895)
+++ opensync/opensync-plugin.h (working copy)
@@ -33,6 +33,7 @@
#include "plugin/opensync_plugin_connection.h"
#include "plugin/opensync_plugin_localization.h"
#include "plugin/opensync_plugin_resource.h"
+#include "plugin/opensync_plugin_externalplugin.h"
#include "plugin/opensync_objtype_sink.h"

OPENSYNC_END_DECLS
Index: opensync/group/opensync_member.c
===================================================================
--- opensync/group/opensync_member.c (revision 5895)
+++ opensync/group/opensync_member.c (working copy)
@@ -832,6 +832,18 @@
return new_list;
}

+const char *osync_member_get_external_command(OSyncMember *member)
+{
+ osync_assert(member);
+ OSyncError *error;
+ OSyncPluginConfig *config = osync_member_get_config_or_default(member, &error);
+ if (config) {
+ OSyncPluginExternalPlugin *externalplugin = osync_plugin_config_get_externalplugin(config);
+ if (externalplugin) return osync_plugin_externalplugin_get_external_command(externalplugin);
+ }
+ return NULL;
+}
+
osync_bool osync_member_objtype_enabled(OSyncMember *member, const char *objtype)
{
OSyncObjTypeSink *sink = NULL;
Index: opensync/group/opensync_member.h
===================================================================
--- opensync/group/opensync_member.h (revision 5895)
+++ opensync/group/opensync_member.h (working copy)
@@ -334,6 +334,25 @@
*/
OSYNC_EXPORT osync_bool osync_member_plugin_is_uptodate(OSyncMember *member);

+/** @brief Returns the external command of a member
+ *
+ * If the plugin is of type OSYNC_START_TYPE_EXTERNAL, an external command can be executed by OpenSync.
+ * The external_command should be a string in printf format, with one %s.
+ * Before the command is executed, a variant of printf will be called
+ * to replace the %s with the path to the plugin pipe.
+ * The resulting command will be exectued with the glib function
+ * g_spawn_command_line_async.
+ *
+ * The external command is specified in the plugin configuration file for the member, e.g.
+ * <ExternalPlugin><ExternalCommand>the command</ExternalCommand></ExternalPlugin>
+ *
+ * @param plugin Pointer to the plugin
+ * @returns External command of the plugin
+ *
+ */
+OSYNC_EXPORT const char *osync_member_get_external_command(OSyncMember *member);
+
+
/*@}*/

#endif /* _OPENSYNC_MEMBER_H_ */
Index: opensync/plugin/opensync_plugin_externalplugin_private.h
===================================================================
--- opensync/plugin/opensync_plugin_externalplugin_private.h (revision 0)
+++ opensync/plugin/opensync_plugin_externalplugin_private.h (revision 0)
@@ -0,0 +1,49 @@
+/*
+ * libopensync - A synchronization framework
+ * Copyright (C) 2009 Henrik Kaare Poulsen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _OPENSYNC_PLUGIN_EXTERNALPLUGIN_PRIVATE_H_
+#define _OPENSYNC_PLUGIN_EXTERNALPLUGIN_PRIVATE_H_
+
+/**
+ * @defgroup OSyncPluginExternalPluginPrivateAPI OpenSync Plugin ExternalPlugin Private
+ * @ingroup OSyncPluginPrivate
+ */
+
+/*@{*/
+
+/**
+ * @brief Gives information for plugin of type OSYNC_START_TYPE_EXTERNAL
+ **/
+struct OSyncPluginExternalPlugin {
+ /** Command to be executed to start the external process.
+ In printf format; should have one %s
+ which will be replaced with
+ the path of the plugin pipe to the client process
+ */
+ char *external_command;
+
+ /** Object reference counting */
+ int ref_count;
+};
+
+/*@}*/
+
+#endif /* _OPENSYNC_PLUGIN_EXTERNALPLUGIN_PRIVATE_H_ */
+
Index: opensync/plugin/opensync_plugin_externalplugin.c
===================================================================
--- opensync/plugin/opensync_plugin_externalplugin.c (revision 0)
+++ opensync/plugin/opensync_plugin_externalplugin.c (revision 0)
@@ -0,0 +1,75 @@
+/*
+ * libopensync - A synchronization framework
+ * Copyright (C) 2009 Henrik Kaare Poulsen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "opensync.h"
+#include "opensync_internals.h"
+
+#include "opensync-plugin.h"
+#include "opensync_plugin_externalplugin_private.h"
+
+OSyncPluginExternalPlugin *osync_plugin_externalplugin_new(OSyncError **error)
+{
+ OSyncPluginExternalPlugin *externalplugin = osync_try_malloc0(sizeof(OSyncPluginExternalPlugin), error);
+ if (!externalplugin)
+ return NULL;
+
+ externalplugin->ref_count = 1;
+
+ return externalplugin;
+}
+
+OSyncPluginExternalPlugin *osync_plugin_externalplugin_ref(OSyncPluginExternalPlugin *externalplugin)
+{
+ osync_assert(externalplugin);
+
+ g_atomic_int_inc(&(externalplugin->ref_count));
+
+ return externalplugin;
+}
+
+void osync_plugin_externalplugin_unref(OSyncPluginExternalPlugin *externalplugin)
+{
+ osync_assert(externalplugin);
+
+ if (g_atomic_int_dec_and_test(&(externalplugin->ref_count))) {
+ if (externalplugin->external_command)
+ osync_free(externalplugin->external_command);
+ osync_free(externalplugin);
+ }
+}
+
+
+const char *osync_plugin_externalplugin_get_external_command(OSyncPluginExternalPlugin *externalplugin)
+{
+ osync_assert(externalplugin);
+ return externalplugin->external_command;
+}
+
+void osync_plugin_externalplugin_set_external_command(OSyncPluginExternalPlugin *externalplugin, const char *external_command)
+{
+ osync_assert(externalplugin);
+
+ if (externalplugin->external_command)
+ osync_free(externalplugin->external_command);
+
+ externalplugin->external_command = osync_strdup(external_command);
+}
+
+
Index: opensync/plugin/opensync_plugin_config_private.h
===================================================================
--- opensync/plugin/opensync_plugin_config_private.h (revision 5895)
+++ opensync/plugin/opensync_plugin_config_private.h (working copy)
@@ -44,6 +44,8 @@
OSyncPluginLocalization *localization;
/** List of resource configurations */
OSyncList *resources;
+ /** External plugin configuration */
+ OSyncPluginExternalPlugin *externalplugin;

/** Flags to store supported config options */
OSyncPluginConfigSupportedFlags supported;
Index: opensync/plugin/opensync_plugin_config.c
===================================================================
--- opensync/plugin/opensync_plugin_config.c (revision 5895)
+++ opensync/plugin/opensync_plugin_config.c (working copy)
@@ -33,6 +33,7 @@
#include "opensync_plugin_connection_internals.h"
#include "opensync_plugin_localization_private.h" /* FIXME: direct access to private header */
#include "opensync_plugin_resource_private.h" /* FIXME: direct access to private header */
+#include "opensync_plugin_externalplugin_private.h" /* FIXME: direct access to private header */

#include "opensync_plugin_config_private.h"
#include "opensync_plugin_config_internals.h"
@@ -209,6 +210,47 @@
return FALSE;
}

+static osync_bool _osync_plugin_config_parse_externalplugin(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
+{
+ OSyncPluginExternalPlugin *externalplugin = NULL;
+ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, config, cur, error);
+
+ if (cur == NULL) { // don't set externalplugin if ExternalPlugin tag is empty
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+ }
+
+ externalplugin = osync_plugin_externalplugin_new(error);
+ if (!externalplugin)
+ goto error;
+
+ for (; cur != NULL; cur = cur->next) {
+ char *str = NULL;
+ if (cur->type != XML_ELEMENT_NODE)
+ continue;
+
+ str = (char*)xmlNodeGetContent(cur);
+ if (!str)
+ continue;
+
+ if (!xmlStrcmp(cur->name, (const xmlChar *)"ExternalCommand")) {
+ osync_plugin_externalplugin_set_external_command(externalplugin, str);
+ }
+
+ osync_xml_free(str);
+ }
+
+ osync_plugin_config_set_externalplugin(config, externalplugin);
+ osync_plugin_externalplugin_unref(externalplugin);
+
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+
+ error:
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+}
+
static osync_bool _osync_plugin_config_parse_connection_bluetooth(OSyncPluginConnection *conn, xmlNode *cur, OSyncError **error) {

osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, conn, cur, error);
@@ -728,6 +770,9 @@
} else if (!xmlStrcmp(cur->name, (const xmlChar *)"Resources")) {
config->supported |= OPENSYNC_PLUGIN_CONFIG_RESOURCES;
ret = _osync_plugin_config_parse_resources(config, cur->xmlChildrenNode, error);
+ } else if (!xmlStrcmp(cur->name, (const xmlChar *)"ExternalPlugin")) {
+ config->supported |= OPENSYNC_PLUGIN_CONFIG_EXTERNALPLUGIN;
+ ret = _osync_plugin_config_parse_externalplugin(config, cur->xmlChildrenNode, error);
} else {
osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Unknown configuration field \"%s\"", cur->name);
goto error;
@@ -824,6 +869,28 @@
return FALSE;
}

+static osync_bool _osync_plugin_config_assemble_externalplugin(xmlNode *cur, OSyncPluginExternalPlugin *externalplugin, OSyncError **error)
+{
+ const char *external_command;
+ xmlNode *node = NULL;
+ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, externalplugin, error);
+
+ node = xmlNewChild(cur, NULL, (xmlChar*)"ExternalPlugin", NULL);
+ if (!node) {
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+ goto error;
+ }
+
+ if ((external_command = osync_plugin_externalplugin_get_external_command(externalplugin)))
+ xmlNewChild(node, NULL, (xmlChar*)"ExternalCommand", (xmlChar*)external_command);
+
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+ error:
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+}
+
static osync_bool _osync_plugin_config_assemble_connection(xmlNode *cur, OSyncPluginConnection *conn, OSyncError **error)
{
char *str;
@@ -1308,6 +1375,9 @@
config->resources = osync_list_remove(config->resources, res);
}

+ if (config->externalplugin)
+ osync_plugin_externalplugin_unref(config->externalplugin);
+
if (config->schemadir)
osync_free(config->schemadir);

@@ -1330,6 +1400,7 @@
OSyncPluginConnection *conn;
OSyncPluginAuthentication *auth;
OSyncPluginLocalization *local;
+ OSyncPluginExternalPlugin *externalplugin;
OSyncList *resources;
OSyncList *options;
char *version_str = NULL;
@@ -1382,6 +1453,11 @@
if (!_osync_plugin_config_assemble_resources(doc->children, resources, error))
goto error_and_free;

+ /* ExternalPlugin */
+ if ((externalplugin = osync_plugin_config_get_externalplugin(config)))
+ if (!_osync_plugin_config_assemble_externalplugin(doc->children, externalplugin, error))
+ goto error_and_free;
+
xmlSaveFormatFile(path, doc, 1);

osync_xml_free_doc(doc);
@@ -1567,7 +1643,27 @@
return NULL;
}

+/* External Plugin */
+OSyncPluginExternalPlugin *osync_plugin_config_get_externalplugin(OSyncPluginConfig *config)
+{
+ osync_assert(config);
+ return config->externalplugin;
+}

+void osync_plugin_config_set_externalplugin(OSyncPluginConfig *config, OSyncPluginExternalPlugin *externalplugin)
+{
+ osync_assert(config);
+
+ if (config->externalplugin) {
+ osync_plugin_externalplugin_unref(config->externalplugin);
+ config->externalplugin = NULL;
+ }
+
+ if (externalplugin) {
+ config->externalplugin = osync_plugin_externalplugin_ref(externalplugin);
+ }
+}
+
OSyncPluginConnection *osync_plugin_config_get_connection(OSyncPluginConfig *config)
{
osync_assert(config);
Index: opensync/plugin/opensync_plugin_externalplugin.h
===================================================================
--- opensync/plugin/opensync_plugin_externalplugin.h (revision 0)
+++ opensync/plugin/opensync_plugin_externalplugin.h (revision 0)
@@ -0,0 +1,87 @@
+/*
+ * libopensync - A synchronization framework
+ * Copyright (C) 2009 Henrik Kaare Poulsen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef _OPENSYNC_PLUGIN_EXTERNALPLUGIN_H_
+#define _OPENSYNC_PLUGIN_EXTERNALPLUGIN_H_
+
+/**
+ * @defgroup OSyncPluginExternalPluginAPI OpenSync Plugin ExternalPlugin
+ * @ingroup OSyncPlugin
+ * @brief Functions for configuring external plugin
+ *
+ */
+/*@{*/
+
+
+/** @brief Create a new OSyncPluginExternalPlugin object
+ *
+ * @param error Pointer to an error struct
+ * @returns the newly created object, or NULL in case of an error.
+ *
+ */
+OSYNC_EXPORT OSyncPluginExternalPlugin *osync_plugin_externalplugin_new(OSyncError **error);
+
+/** @brief Decrease the reference count on an OSyncPluginExternalPlugin object
+ *
+ * @param external_plugin Pointer to the OSyncPluginExternalPlugin object
+ *
+ */
+OSYNC_EXPORT void osync_plugin_externalplugin_unref(OSyncPluginExternalPlugin *external_plugin);
+
+/** @brief Increase the reference count on an OSyncPluginExternalPlugin object
+ *
+ * @param external_plugin Pointer to the OSyncPluginExternalPlugin object
+ * @returns The OSyncPluginExternalPlugin object passed in
+ *
+ */
+OSYNC_EXPORT OSyncPluginExternalPlugin *osync_plugin_externalplugin_ref(OSyncPluginExternalPlugin *external_plugin);
+
+
+/** @brief Get the command to start the external plugin process
+ *
+ * @param external_plugin Pointer to the OSyncPluginExternalPlugin object
+ * @returns the external command or NULL if not set
+ *
+ */
+OSYNC_EXPORT const char *osync_plugin_externalplugin_get_external_command(OSyncPluginExternalPlugin *external_plugin);
+
+/** @brief Set the command to start the external plugin process
+ *
+ * If the plugin is of type OSYNC_START_TYPE_EXTERNAL, an external command can be executed by OpenSync.
+ * The external_command should be a string in printf format, with one %s.
+ * Before the command is executed, a variant of printf will be called
+ * to replace the %s with the path to the plugin pipe.
+ * The resulting command will be exectued with the glib function
+ * g_spawn_command_line_async.
+ *
+ * Example: "thunderbird -mozilla-sync %s"
+ *
+ * @param external_plugin Pointer to the OSyncPluginExternalPlugin object
+ * @param external_command The external command to set
+ *
+ */
+OSYNC_EXPORT void osync_plugin_externalplugin_set_external_command(OSyncPluginExternalPlugin *external_plugin, const char *external_command);
+
+
+
+/*@}*/
+
+#endif /*_OPENSYNC_PLUGIN_EXTERNALPLUGIN_H_*/
+
Index: opensync/plugin/opensync_plugin_config.h
===================================================================
--- opensync/plugin/opensync_plugin_config.h (revision 5895)
+++ opensync/plugin/opensync_plugin_config.h (working copy)
@@ -47,7 +47,9 @@
/** Resources */
OPENSYNC_PLUGIN_CONFIG_RESOURCES = (1 << 3),
/** Connection options */
- OPENSYNC_PLUGIN_CONFIG_CONNECTION = (1 << 4)
+ OPENSYNC_PLUGIN_CONFIG_CONNECTION = (1 << 4),
+ /** External Plugin */
+ OPENSYNC_PLUGIN_CONFIG_EXTERNALPLUGIN = (1 << 5)
} OSyncPluginConfigSupportedFlag;

/** @brief Set of OSyncPluginConfigSupportedFlags
@@ -217,6 +219,21 @@
*/
OSYNC_EXPORT void osync_plugin_config_set_connection(OSyncPluginConfig *config, OSyncPluginConnection *connection);

+/* External Plugin */
+/**@brief Get the external plugin settings from a config
+ *
+ * @param config An OSyncPluginConfig
+ * @returns an OSyncPluginExternalPlugin with the details of the external plugin or NULL if no external plugin settings configured
+ */
+OSYNC_EXPORT OSyncPluginExternalPlugin *osync_plugin_config_get_externalplugin(OSyncPluginConfig *config);
+
+/**@brief Set the external plugin configuration
+ *
+ * @param config An OSyncPluginConfig
+ * @param authentication The new external plugin settings as an OSyncPluginExternalPlugin
+ */
+OSYNC_EXPORT void osync_plugin_config_set_externalplugin(OSyncPluginConfig *config, OSyncPluginExternalPlugin *externalplugin);
+
/*@}*/

#endif /*_OPENSYNC_PLUGIN_CONFIG_H_*/
Index: opensync/CMakeLists.txt
===================================================================
--- opensync/CMakeLists.txt (revision 5895)
+++ opensync/CMakeLists.txt (working copy)
@@ -60,6 +60,7 @@
plugin/opensync_plugin_info.c
plugin/opensync_plugin_localization.c
plugin/opensync_plugin_resource.c
+ plugin/opensync_plugin_externalplugin.c
plugin/opensync_objtype_sink.c
version/opensync_version.c
xmlformat/opensync_xmlfield.c
Index: opensync/opensync.h
===================================================================
--- opensync/opensync.h (revision 5895)
+++ opensync/opensync.h (working copy)
@@ -222,6 +222,7 @@
typedef struct OSyncPluginConnection OSyncPluginConnection;
typedef struct OSyncPluginLocalization OSyncPluginLocalization;
typedef struct OSyncPluginResource OSyncPluginResource;
+typedef struct OSyncPluginExternalPlugin OSyncPluginExternalPlugin;

/* Engine component */
typedef struct OSyncEngine OSyncEngine;
Index: opensync/engine/opensync_engine.c
===================================================================
--- opensync/engine/opensync_engine.c (revision 5895)
+++ opensync/engine/opensync_engine.c (working copy)
@@ -773,7 +773,11 @@
osync_client_proxy_set_context(proxy, engine->context);
osync_client_proxy_set_change_callback(proxy, _osync_engine_receive_change, engine);

- if (!osync_client_proxy_spawn(proxy, osync_plugin_get_start_type(plugin), osync_member_get_configdir(member), error))
+ const char *external_command=NULL;
+ if (osync_plugin_get_start_type(plugin)==OSYNC_START_TYPE_EXTERNAL)
+ external_command=osync_member_get_external_command(member);
+
+ if (!osync_client_proxy_spawn(proxy, osync_plugin_get_start_type(plugin), osync_member_get_configdir(member), external_command, error))
goto error_free_proxy;

engine->busy = TRUE;
Index: opensync/client/opensync_client_proxy_internals.h
===================================================================
--- opensync/client/opensync_client_proxy_internals.h (revision 5895)
+++ opensync/client/opensync_client_proxy_internals.h (working copy)
@@ -44,7 +44,7 @@
void osync_client_proxy_set_change_callback(OSyncClientProxy *proxy, change_cb cb, void *userdata);
OSyncMember *osync_client_proxy_get_member(OSyncClientProxy *proxy);

-OSYNC_TEST_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, OSyncError **error);
+OSYNC_TEST_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, const char* external_command, OSyncError **error);
OSYNC_TEST_EXPORT osync_bool osync_client_proxy_shutdown(OSyncClientProxy *proxy, OSyncError **error);

OSYNC_TEST_EXPORT osync_bool osync_client_proxy_initialize(OSyncClientProxy *proxy, initialize_cb callback, void *userdata, const char *formatdir, const char *plugindir, const char *plugin, const char *groupname, const char *configdir, OSyncPluginConfig *config, OSyncError **error);
Index: opensync/client/opensync_client_proxy.c
===================================================================
--- opensync/client/opensync_client_proxy.c (revision 5895)
+++ opensync/client/opensync_client_proxy.c (working copy)
@@ -952,7 +952,7 @@
return proxy->member;
}

-osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, OSyncError **error)
+osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, const char* external_command, OSyncError **error)
{
OSyncQueue *read1 = NULL;
OSyncQueue *read2 = NULL;
@@ -1080,6 +1080,22 @@
goto error;
} else {
name = osync_strdup_printf("%s%cpluginpipe", path, G_DIR_SEPARATOR);
+
+ if (external_command) {
+ char *command = osync_strdup_printf(external_command, name);
+ osync_trace(TRACE_INTERNAL, "g_spawn_command_line_async(%s)", command);
+ GError *gerror = NULL;
+ gboolean f = g_spawn_command_line_async(command, &gerror);
+ if (!f) {
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to g_spawn_command_line_async(%s): %s", command, gerror->message);
+ g_error_free (gerror);
+ osync_free(command);
+ goto error;
+ }
+ osync_free(command);
+ }
+
+
proxy->outgoing = osync_queue_new(name, error);
osync_free(name);
if (!proxy->outgoing)
Index: tests/client-tests/check_proxy.c
===================================================================
--- tests/client-tests/check_proxy.c (revision 5895)
+++ tests/client-tests/check_proxy.c (working copy)
@@ -39,7 +39,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

fail_unless(osync_client_proxy_shutdown(proxy, &error), NULL);
@@ -110,7 +110,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);
@@ -159,7 +159,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);
@@ -225,7 +225,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-10-31T02:57:37Z

Great!

Thanks a lot Daniel.
Works like a charm!

/Henrik

Daniel Gollub wrote:
> Hi,
>
>
> finally we have an example implementation for OSYNC_START_TYPE_EXTERNAL.
>
> [...]

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

[trunk] OSYNC_START_TYPE_EXTERNAL example / OSyncClient API changes

2009-10-30T14:49:22Z

Hi,

finally we have an example implementation for OSYNC_START_TYPE_EXTERNAL.

What this OSYNC_START_TYPE_EXTERNAL about?

This allows to write (standalone) userspace applications which act as OpenSync
plugin. You can use this for example if you try to gather data from an
existing application, which doesn't provides any public interface - e.g. an
extension of an application which communicates with OpenSync.

Currently, there is need of stub plugin, which registers the plugin to the
OpenSync environment. As Graham already suggested in a seperated thread, we'll
very likely change it - so there is only need to write a simple configuration
file to register external plugins.

Additionally we'll add some configuration options so OpenSync can spawn such
external process if they haven't be launced yet. For now such applications
have to be started manually ...

See:
http://opensync.org/browser/trunk/docs/examples/plugins/src/external_demo.c
and
http://opensync.org/changeset/5895

-------8<-------
$ ./example_external_demo ~/.config/opensync/0.40/group6/1/pluginpipe &
[1] 10841
$
[EXTERNAL-DEMO]: OSyncPlugin:0x40159d OSyncClient:0x603040
[EXTERNAL-DEMO]: Starting (blocking) OSyncClient ...
$
$ osynctool --sync external
Synchronizing group "external"
[EXTERNAL-DEMO]: initialize
data sink of member 2 of type file-sync just connected
Main sink of member 2 of type file-sync just connected
data sink of member 1 of type external-demo just connected
Main sink of member 1 of type external-demo just connected
All clients connected or error
[EXTERNAL-DEMO]: get_changes slow_sync: no
data sink of member 2 of type file-sync just sent all changes
data sink of member 1 of type external-demo just sent all changes
Main sink of member 1 of type external-demo just sent all changes
Main sink of member 2 of type file-sync just sent all changes
[...]
The sync was successful
data sink of member 1 of type external-demo just disconnected
Main sink of member 1 of type external-demo just disconnected
data sink of member 2 of type file-sync just disconnected
Main sink of member 2 of type file-sync just disconnected
All clients have disconnected
[EXTERNAL-DEMO]: OSyncClient completed.
[1]+ Done ./example_external_demo ~/.config/opensync/0.40/group6/1/pluginpipe
$
-------->8-----------

This required changes on the OSyncClient API:

osync_client_{get,set}_{plugin,pipe_path} got added to the public API. Which
are used to write an external plugin (see reference implementation).

An public interface which shouldn't be widely used yet got changed:
osync_client_run_and_block() got an additional parameter (OSyncError **) and
changed the return value from void to osync_bool. (Should be very trivial to
port).

If there are any questions regarding this changes, don't hesistate to ask on
the opensync-devel Mailinglist.

Thanks to Henrik and Graham for their feedback and help to get this working!

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [RFC][PATCH] OSYNC_START_TYPE_EXTERNAL * new patch *

2009-10-30T10:11:16Z

Just for reference, the external process basically boils down to this
function:

static int run_plugin(BZOpenSyncPlugin *pbz) {

osync_trace(TRACE_ENTRY, "%s", __func__);

OSyncError *error = NULL;
OSyncQueue *incoming = NULL;
OSyncQueue *outgoing = NULL;
OSyncClient *client = NULL;

client = osync_client_new(&error);
if (!client)
goto done;

osync_client_set_overriding_plugin_dir(client, pbz->mySzPathToLib);

/* Create connection pipes **/
incoming = osync_queue_new(pbz->mySzPathToPipe, &error);
if (!incoming)
goto error;

if (!osync_queue_create(incoming, &error))
goto error;

/* We now connect to our incoming queue */
if (!osync_queue_connect(incoming, OSYNC_QUEUE_RECEIVER, &error))
goto error;

if (!osync_client_set_incoming_queue(client, incoming, &error))
goto error;

osync_queue_unref(incoming);

osync_client_run_and_block(client);

osync_client_unref(client);

printf("blueZync synchronization client thread complete\n");

osync_trace(TRACE_EXIT, "%s", __func__);
return NS_OK;

error:
osync_client_unref(client);

done:
osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__,
osync_error_print(&error));
fprintf(stderr, "Unable to initialize environment: %s\n",
osync_error_print(&error));
osync_error_unref(&error);
return NS_ERROR_FAILURE;
}

Henrik /KaarPoSoft wrote:

> Hi all,
>
> I have earlier provided a patch so a plugin of type
> OSYNC_START_TYPE_EXTERNAL can set
> osync_plugin_set_start_external_command.
>
> However, after some thought, I actually think it should be on the
> OSyncPluginConfig.
>
> In this way, different members can have different external commands
> with the same plugin.
>
> I.e. the config for mozilla-sync plugin could specify thunderbird or
> sunbird or even the Debian ice-*.
>
> Please find attached a combined patch.
>
> Comments?
>
> /Henrik
>

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC][PATCH] OSYNC_START_TYPE_EXTERNAL * new patch *

2009-10-30T10:05:38Z

Hi all,

I have earlier provided a patch so a plugin of type
OSYNC_START_TYPE_EXTERNAL can set osync_plugin_set_start_external_command.

However, after some thought, I actually think it should be on the
OSyncPluginConfig.

In this way, different members can have different external commands with
the same plugin.

I.e. the config for mozilla-sync plugin could specify thunderbird or
sunbird or even the Debian ice-*.

Please find attached a combined patch.

Comments?

/Henrik

Index: misc/schemas/plugin_config.xsd
===================================================================
--- misc/schemas/plugin_config.xsd (revision 5882)
+++ misc/schemas/plugin_config.xsd (working copy)
@@ -9,6 +9,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="Connection" type="Connection"/>
<xsd:element maxOccurs="1" minOccurs="0" name="Localization" type="Localization"/>
<xsd:element maxOccurs="1" minOccurs="0" name="Resources" type="Resources"/>
+ <xsd:element maxOccurs="1" minOccurs="0" name="ExternalPlugin" type="ExternalPlugin"/>
</xsd:sequence>
<xsd:attribute name="version" type="xsd:string"/>
</xsd:complexType>
@@ -164,4 +165,10 @@
</xsd:all>
</xsd:complexType>

+ <xsd:complexType name="ExternalPlugin">
+ <xsd:all>
+ <xsd:element maxOccurs="1" minOccurs="1" name="ExternalCommand" type="xsd:string" />
+ </xsd:all>
+ </xsd:complexType>
+
</xsd:schema>
Index: opensync/opensync-plugin.h
===================================================================
--- opensync/opensync-plugin.h (revision 5882)
+++ opensync/opensync-plugin.h (working copy)
@@ -33,6 +33,7 @@
#include "plugin/opensync_plugin_connection.h"
#include "plugin/opensync_plugin_localization.h"
#include "plugin/opensync_plugin_resource.h"
+#include "plugin/opensync_plugin_externalplugin.h"
#include "plugin/opensync_objtype_sink.h"

OPENSYNC_END_DECLS
Index: opensync/group/opensync_member.c
===================================================================
--- opensync/group/opensync_member.c (revision 5882)
+++ opensync/group/opensync_member.c (working copy)
@@ -832,6 +832,18 @@
return new_list;
}

+const char *osync_member_get_external_command(OSyncMember *member)
+{
+ osync_assert(member);
+ OSyncError *error;
+ OSyncPluginConfig *config = osync_member_get_config_or_default(member, &error);
+ if (config) {
+ OSyncPluginExternalPlugin *externalplugin = osync_plugin_config_get_externalplugin(config);
+ if (externalplugin) return osync_plugin_externalplugin_get_external_command(externalplugin);
+ }
+ return NULL;
+}
+
osync_bool osync_member_objtype_enabled(OSyncMember *member, const char *objtype)
{
OSyncObjTypeSink *sink = NULL;
Index: opensync/group/opensync_member.h
===================================================================
--- opensync/group/opensync_member.h (revision 5882)
+++ opensync/group/opensync_member.h (working copy)
@@ -334,6 +334,25 @@
*/
OSYNC_EXPORT osync_bool osync_member_plugin_is_uptodate(OSyncMember *member);

+/** @brief Returns the external command of a member
+ *
+ * If the plugin is of type OSYNC_START_TYPE_EXTERNAL, an external command can be executed by OpenSync.
+ * The external_command should be a string in printf format, with one %s.
+ * Before the command is executed, a variant of printf will be called
+ * to replace the %s with the path to the plugin pipe.
+ * The resulting command will be exectued with the glib function
+ * g_spawn_command_line_async.
+ *
+ * The external command is specified in the plugin configuration file for the member, e.g.
+ * <ExternalPlugin><ExternalCommand>the command</ExternalCommand></ExternalPlugin>
+ *
+ * @param plugin Pointer to the plugin
+ * @returns External command of the plugin
+ *
+ */
+OSYNC_EXPORT const char *osync_member_get_external_command(OSyncMember *member);
+
+
/*@}*/

#endif /* _OPENSYNC_MEMBER_H_ */
Index: opensync/plugin/opensync_plugin_config_private.h
===================================================================
--- opensync/plugin/opensync_plugin_config_private.h (revision 5882)
+++ opensync/plugin/opensync_plugin_config_private.h (working copy)
@@ -44,6 +44,8 @@
OSyncPluginLocalization *localization;
/** List of resource configurations */
OSyncList *resources;
+ /** External plugin configuration */
+ OSyncPluginExternalPlugin *externalplugin;

/** Flags to store supported config options */
OSyncPluginConfigSupportedFlags supported;
Index: opensync/plugin/opensync_plugin_config.c
===================================================================
--- opensync/plugin/opensync_plugin_config.c (revision 5882)
+++ opensync/plugin/opensync_plugin_config.c (working copy)
@@ -33,6 +33,7 @@
#include "opensync_plugin_connection_internals.h"
#include "opensync_plugin_localization_private.h" /* FIXME: direct access to private header */
#include "opensync_plugin_resource_private.h" /* FIXME: direct access to private header */
+#include "opensync_plugin_externalplugin_private.h" /* FIXME: direct access to private header */

#include "opensync_plugin_config_private.h"
#include "opensync_plugin_config_internals.h"
@@ -209,6 +210,47 @@
return FALSE;
}

+static osync_bool _osync_plugin_config_parse_externalplugin(OSyncPluginConfig *config, xmlNode *cur, OSyncError **error)
+{
+ OSyncPluginExternalPlugin *externalplugin = NULL;
+ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, config, cur, error);
+
+ if (cur == NULL) { // don't set externalplugin if ExternalPlugin tag is empty
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+ }
+
+ externalplugin = osync_plugin_externalplugin_new(error);
+ if (!externalplugin)
+ goto error;
+
+ for (; cur != NULL; cur = cur->next) {
+ char *str = NULL;
+ if (cur->type != XML_ELEMENT_NODE)
+ continue;
+
+ str = (char*)xmlNodeGetContent(cur);
+ if (!str)
+ continue;
+
+ if (!xmlStrcmp(cur->name, (const xmlChar *)"ExternalCommand")) {
+ osync_plugin_externalplugin_set_external_command(externalplugin, str);
+ }
+
+ osync_xml_free(str);
+ }
+
+ osync_plugin_config_set_externalplugin(config, externalplugin);
+ osync_plugin_externalplugin_unref(externalplugin);
+
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+
+ error:
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+}
+
static osync_bool _osync_plugin_config_parse_connection_bluetooth(OSyncPluginConnection *conn, xmlNode *cur, OSyncError **error) {

osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, conn, cur, error);
@@ -728,6 +770,9 @@
} else if (!xmlStrcmp(cur->name, (const xmlChar *)"Resources")) {
config->supported |= OPENSYNC_PLUGIN_CONFIG_RESOURCES;
ret = _osync_plugin_config_parse_resources(config, cur->xmlChildrenNode, error);
+ } else if (!xmlStrcmp(cur->name, (const xmlChar *)"ExternalPlugin")) {
+ config->supported |= OPENSYNC_PLUGIN_CONFIG_EXTERNALPLUGIN;
+ ret = _osync_plugin_config_parse_externalplugin(config, cur->xmlChildrenNode, error);
} else {
osync_error_set(error, OSYNC_ERROR_MISCONFIGURATION, "Unknown configuration field \"%s\"", cur->name);
goto error;
@@ -824,6 +869,28 @@
return FALSE;
}

+static osync_bool _osync_plugin_config_assemble_externalplugin(xmlNode *cur, OSyncPluginExternalPlugin *externalplugin, OSyncError **error)
+{
+ const char *external_command;
+ xmlNode *node = NULL;
+ osync_trace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, cur, externalplugin, error);
+
+ node = xmlNewChild(cur, NULL, (xmlChar*)"ExternalPlugin", NULL);
+ if (!node) {
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "No memory left to assemble configuration.");
+ goto error;
+ }
+
+ if ((external_command = osync_plugin_externalplugin_get_external_command(externalplugin)))
+ xmlNewChild(node, NULL, (xmlChar*)"ExternalCommand", (xmlChar*)external_command);
+
+ osync_trace(TRACE_EXIT, "%s", __func__);
+ return TRUE;
+ error:
+ osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
+ return FALSE;
+}
+
static osync_bool _osync_plugin_config_assemble_connection(xmlNode *cur, OSyncPluginConnection *conn, OSyncError **error)
{
char *str;
@@ -1308,6 +1375,9 @@
config->resources = osync_list_remove(config->resources, res);
}

+ if (config->externalplugin)
+ osync_plugin_externalplugin_unref(config->externalplugin);
+
if (config->schemadir)
osync_free(config->schemadir);

@@ -1330,6 +1400,7 @@
OSyncPluginConnection *conn;
OSyncPluginAuthentication *auth;
OSyncPluginLocalization *local;
+ OSyncPluginExternalPlugin *externalplugin;
OSyncList *resources;
OSyncList *options;
char *version_str = NULL;
@@ -1382,6 +1453,11 @@
if (!_osync_plugin_config_assemble_resources(doc->children, resources, error))
goto error_and_free;

+ /* ExternalPlugin */
+ if ((externalplugin = osync_plugin_config_get_externalplugin(config)))
+ if (!_osync_plugin_config_assemble_externalplugin(doc->children, externalplugin, error))
+ goto error_and_free;
+
xmlSaveFormatFile(path, doc, 1);

osync_xml_free_doc(doc);
@@ -1567,7 +1643,27 @@
return NULL;
}

+/* External Plugin */
+OSyncPluginExternalPlugin *osync_plugin_config_get_externalplugin(OSyncPluginConfig *config)
+{
+ osync_assert(config);
+ return config->externalplugin;
+}

+void osync_plugin_config_set_externalplugin(OSyncPluginConfig *config, OSyncPluginExternalPlugin *externalplugin)
+{
+ osync_assert(config);
+
+ if (config->externalplugin) {
+ osync_plugin_externalplugin_unref(config->externalplugin);
+ config->externalplugin = NULL;
+ }
+
+ if (externalplugin) {
+ config->externalplugin = osync_plugin_externalplugin_ref(externalplugin);
+ }
+}
+
OSyncPluginConnection *osync_plugin_config_get_connection(OSyncPluginConfig *config)
{
osync_assert(config);
Index: opensync/plugin/opensync_plugin_config.h
===================================================================
--- opensync/plugin/opensync_plugin_config.h (revision 5882)
+++ opensync/plugin/opensync_plugin_config.h (working copy)
@@ -47,7 +47,9 @@
/** Resources */
OPENSYNC_PLUGIN_CONFIG_RESOURCES = (1 << 3),
/** Connection options */
- OPENSYNC_PLUGIN_CONFIG_CONNECTION = (1 << 4)
+ OPENSYNC_PLUGIN_CONFIG_CONNECTION = (1 << 4),
+ /** External Plugin */
+ OPENSYNC_PLUGIN_CONFIG_EXTERNALPLUGIN = (1 << 5)
} OSyncPluginConfigSupportedFlag;

/** @brief Set of OSyncPluginConfigSupportedFlags
@@ -217,6 +219,21 @@
*/
OSYNC_EXPORT void osync_plugin_config_set_connection(OSyncPluginConfig *config, OSyncPluginConnection *connection);

+/* External Plugin */
+/**@brief Get the external plugin settings from a config
+ *
+ * @param config An OSyncPluginConfig
+ * @returns an OSyncPluginExternalPlugin with the details of the external plugin or NULL if no external plugin settings configured
+ */
+OSYNC_EXPORT OSyncPluginExternalPlugin *osync_plugin_config_get_externalplugin(OSyncPluginConfig *config);
+
+/**@brief Set the external plugin configuration
+ *
+ * @param config An OSyncPluginConfig
+ * @param authentication The new external plugin settings as an OSyncPluginExternalPlugin
+ */
+OSYNC_EXPORT void osync_plugin_config_set_externalplugin(OSyncPluginConfig *config, OSyncPluginExternalPlugin *externalplugin);
+
/*@}*/

#endif /*_OPENSYNC_PLUGIN_CONFIG_H_*/
Index: opensync/CMakeLists.txt
===================================================================
--- opensync/CMakeLists.txt (revision 5882)
+++ opensync/CMakeLists.txt (working copy)
@@ -60,6 +60,7 @@
plugin/opensync_plugin_info.c
plugin/opensync_plugin_localization.c
plugin/opensync_plugin_resource.c
+ plugin/opensync_plugin_externalplugin.c
plugin/opensync_objtype_sink.c
version/opensync_version.c
xmlformat/opensync_xmlfield.c
Index: opensync/opensync.h
===================================================================
--- opensync/opensync.h (revision 5882)
+++ opensync/opensync.h (working copy)
@@ -213,6 +213,7 @@
typedef struct OSyncPluginConnection OSyncPluginConnection;
typedef struct OSyncPluginLocalization OSyncPluginLocalization;
typedef struct OSyncPluginResource OSyncPluginResource;
+typedef struct OSyncPluginExternalPlugin OSyncPluginExternalPlugin;

/* Engine component */
typedef struct OSyncEngine OSyncEngine;
Index: opensync/engine/opensync_engine.c
===================================================================
--- opensync/engine/opensync_engine.c (revision 5882)
+++ opensync/engine/opensync_engine.c (working copy)
@@ -773,7 +773,11 @@
osync_client_proxy_set_context(proxy, engine->context);
osync_client_proxy_set_change_callback(proxy, _osync_engine_receive_change, engine);

- if (!osync_client_proxy_spawn(proxy, osync_plugin_get_start_type(plugin), osync_member_get_configdir(member), error))
+ const char *external_command=NULL;
+ if (osync_plugin_get_start_type(plugin)==OSYNC_START_TYPE_EXTERNAL)
+ external_command=osync_member_get_external_command(member);
+
+ if (!osync_client_proxy_spawn(proxy, osync_plugin_get_start_type(plugin), osync_member_get_configdir(member), external_command, error))
goto error_free_proxy;

engine->busy = TRUE;
Index: opensync/client/opensync_client.h
===================================================================
--- opensync/client/opensync_client.h (revision 5882)
+++ opensync/client/opensync_client.h (working copy)
@@ -25,6 +25,29 @@
OSYNC_EXPORT OSyncClient *osync_client_ref(OSyncClient *client);
OSYNC_EXPORT void osync_client_unref(OSyncClient *client);

+/** @brief Set the directory from which the client shall load plugins
+ *
+ * In general, the "overriding_plugin_dir" does not need to be set.
+ * However, if a plugin has start type OSYNC_START_TYPE_EXTERNAL,
+ * and wishes to load a different plugin library in the external process,
+ * but still use the OSyncClient code, then osync_client_set_overriding_plugin_dir
+ * can be called to instruct OpenSync to look for the plugin library
+ * in an alternative location.
+ *
+ * @param plugin Pointer to the client
+ * @param overriding_plugin_dir The directory from which the client shall load plugins
+ *
+ */
+OSYNC_EXPORT void osync_client_set_overriding_plugin_dir(OSyncClient *client, char *overriding_plugin_dir);
+
+/** @brief Get the directory from which the client will load plugins
+ *
+ * @param client Pointer to the client
+ * @returns The directory from which the client will load plugins
+ *
+ */
+OSYNC_EXPORT char *osync_client_get_overriding_plugin_dir(OSyncClient *client);
+
OSYNC_EXPORT osync_bool osync_client_set_incoming_queue(OSyncClient *client, OSyncQueue *incoming, OSyncError **error);
OSYNC_EXPORT osync_bool osync_client_set_outgoing_queue(OSyncClient *client, OSyncQueue *outgoing, OSyncError **error);

Index: opensync/client/opensync_client_proxy_internals.h
===================================================================
--- opensync/client/opensync_client_proxy_internals.h (revision 5882)
+++ opensync/client/opensync_client_proxy_internals.h (working copy)
@@ -44,7 +44,7 @@
void osync_client_proxy_set_change_callback(OSyncClientProxy *proxy, change_cb cb, void *userdata);
OSyncMember *osync_client_proxy_get_member(OSyncClientProxy *proxy);

-OSYNC_TEST_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, OSyncError **error);
+OSYNC_TEST_EXPORT osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, const char* external_command, OSyncError **error);
OSYNC_TEST_EXPORT osync_bool osync_client_proxy_shutdown(OSyncClientProxy *proxy, OSyncError **error);

OSYNC_TEST_EXPORT osync_bool osync_client_proxy_initialize(OSyncClientProxy *proxy, initialize_cb callback, void *userdata, const char *formatdir, const char *plugindir, const char *plugin, const char *groupname, const char *configdir, OSyncPluginConfig *config, OSyncError **error);
Index: opensync/client/opensync_client_private.h
===================================================================
--- opensync/client/opensync_client_private.h (revision 5882)
+++ opensync/client/opensync_client_private.h (working copy)
@@ -32,6 +32,7 @@
OSyncPluginInfo *plugin_info;
OSyncPluginEnv *plugin_env;
OSyncFormatEnv *format_env;
+ char *overriding_plugin_dir;
void *plugin_data;
OSyncThread *thread;
};
Index: opensync/client/opensync_client.c
===================================================================
--- opensync/client/opensync_client.c (revision 5882)
+++ opensync/client/opensync_client.c (working copy)
@@ -684,7 +684,14 @@
osync_queue_unref(outgoing);
osync_trace(TRACE_INTERNAL, "done connecting to engine");
}
-
+
+ char *overriding_plugin_dir = osync_client_get_overriding_plugin_dir(client);
+ osync_trace(TRACE_INTERNAL, "overriding_plugin_dir=[%s]", overriding_plugin_dir);
+ if (overriding_plugin_dir) {
+ osync_free(plugindir);
+ plugindir=osync_strdup(overriding_plugin_dir);
+ }
+
if (!client->plugin) {
client->plugin_env = osync_plugin_env_new(error);
if (!client->plugin_env)
@@ -1699,12 +1706,29 @@
if (client->thread)
osync_thread_unref(client->thread);

+ if (client->overriding_plugin_dir)
+ osync_free(client->overriding_plugin_dir);
+
osync_free(client);

osync_trace(TRACE_EXIT, "%s", __func__);
}
}

+void osync_client_set_overriding_plugin_dir(OSyncClient *client, char *overriding_plugin_dir)
+{
+ osync_assert(client);
+ if (client->overriding_plugin_dir)
+ osync_free(client->overriding_plugin_dir);
+ client->overriding_plugin_dir = osync_strdup(overriding_plugin_dir);
+}
+
+char *osync_client_get_overriding_plugin_dir(OSyncClient *client)
+{
+ osync_assert(client);
+ return client->overriding_plugin_dir;
+}
+
osync_bool osync_client_set_incoming_queue(OSyncClient *client, OSyncQueue *incoming, OSyncError **error)
{
osync_queue_set_message_handler(incoming, _osync_client_message_handler, client);
Index: opensync/client/opensync_client_proxy.c
===================================================================
--- opensync/client/opensync_client_proxy.c (revision 5882)
+++ opensync/client/opensync_client_proxy.c (working copy)
@@ -952,7 +952,7 @@
return proxy->member;
}

-osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, OSyncError **error)
+osync_bool osync_client_proxy_spawn(OSyncClientProxy *proxy, OSyncStartType type, const char *path, const char* external_command, OSyncError **error)
{
OSyncQueue *read1 = NULL;
OSyncQueue *read2 = NULL;
@@ -1080,6 +1080,22 @@
goto error;
} else {
name = osync_strdup_printf("%s%cpluginpipe", path, G_DIR_SEPARATOR);
+
+ if (external_command) {
+ char *command = osync_strdup_printf(external_command, name);
+ osync_trace(TRACE_INTERNAL, "g_spawn_command_line_async(%s)", command);
+ GError *gerror = NULL;
+ gboolean f = g_spawn_command_line_async(command, &gerror);
+ if (!f) {
+ osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to g_spawn_command_line_async(%s): %s", command, gerror->message);
+ g_error_free (gerror);
+ osync_free(command);
+ goto error;
+ }
+ osync_free(command);
+ }
+
+
proxy->outgoing = osync_queue_new(name, error);
osync_free(name);
if (!proxy->outgoing)
Index: tests/client-tests/check_proxy.c
===================================================================
--- tests/client-tests/check_proxy.c (revision 5882)
+++ tests/client-tests/check_proxy.c (working copy)
@@ -39,7 +39,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

fail_unless(osync_client_proxy_shutdown(proxy, &error), NULL);
@@ -110,7 +110,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);
@@ -159,7 +159,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);
@@ -225,7 +225,7 @@
fail_unless(proxy != NULL, NULL);
fail_unless(error == NULL, NULL);

- fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, &error), NULL);
+ fail_unless(osync_client_proxy_spawn(proxy, OSYNC_START_TYPE_THREAD, NULL, NULL, &error), NULL);
fail_unless(error == NULL, NULL);

OSyncPluginConfig *config = simple_plugin_config(NULL, "data1", "mockobjtype1", "mockformat1", NULL);

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC] Different libraries for OSYNC_START_TYPE_EXTERNAL

2009-10-29T09:49:00Z

Graham Cobb wrote:

> On Thursday 29 October 2009 15:55:40 Henrik /KaarPoSoft wrote:
>
>> Daniel Gollub wrote:
>>
>>> And your real "plugin" which is acutally a complete different process -
>>> or even an own application is implementing a full OSyncClient and
>>> OSyncPlugin environment? Completeyl without that get_sync_info() stuff
>>> ...
>>>
>> I could do that, but it would take a lot of coding to make my own
>> OSyncClient. That's why I simply use the full opensync library. That's
>> only 10 lines of code!
>>
>
> I think that is what I have been trying to suggest (badly) -- thanks for the
> clarification Daniel.
>
> But, of course, Henrik, you shouldn't have to implement your own OSyncClient.
> What we have to do is to make the client code and plugin support code usable
> from your process, without bringing in all the rest of OpenSync. That may be
> harder than it looks because some functions that plugins call may assume the
> whole OpenSync environment is present.
>

Any hints on how to do that would be appreciated!

/Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC][PATCH] OSYNC_START_TYPE_EXTERNAL

2009-10-29T09:47:35Z

Graham Cobb wrote:

> On Thursday 29 October 2009 15:48:33 Henrik /KaarPoSoft wrote:
>
>> As I wrote in a different thread, I am not sure if my way of
>> implementing the external process is the intended one. I am simply
>> running the same kind of client that would have been running inside
>> osynctool, by calling the same opensync libraries. That means that
>> without osync_client_get_overriding_plugin_dir the opensync library
>> would load the slim mozilla-sync plugin which was intended for
>> osynctool/engine, not the new fat mozilla-sync plugin intended for the
>> external process.
>>
>
> There seem to be two possible solutions:
>
> 1) The "thin" plugin could just be replaced with a configuration file. What
> does OpenSync need to know about external process plugins? Presumably pretty
> much just the fact that they are external and how to contact them.
>
> Should we add a config file to supply that info? Then opensync would just not
> attempt to load any plugin for which it had already read a config file.
>

Good idea. Daniel, your call!

> 2) Or, the fat plugin could not really be a plugin. It could be completely up
> to the caller of opensync in the external process to have the plugin code
> loaded (presumably statically linked into the executable) and opensync, when
> invoked to just create a client, would not load **any** plugins. There would
> have to be a function to call to register a plugin by passing in the
> get_plugin_info address.
>
> I **think** this second option was how the original external code worked, but
> I haven't checked the code so I might be completely wrong.
>

Could you point me to where to find "the original external code"?
I have not been able to find any implementation of an external
process/plugin - except for osplugin.
> I am keen to keep the external client code as minimal as possible. In
> particular, if we are every going to make IPC and timeout work properly I
> certainly don't want two full IPC instances communicating -- there are enough
> queues as it is!
>
I don't think this approach introduces any new queues.
I believe there are two bidirectional queues in any case (engine and
plugin), it is just a question of whether they are accessed from
different threads in the same thread of from different processes.

/Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC] Different libraries for OSYNC_START_TYPE_EXTERNAL

2009-10-29T09:35:39Z

On Thursday 29 October 2009 15:55:40 Henrik /KaarPoSoft wrote:
> Daniel Gollub wrote:
> > And your real "plugin" which is acutally a complete different process -
> > or even an own application is implementing a full OSyncClient and
> > OSyncPlugin environment? Completeyl without that get_sync_info() stuff
> > ...
>
> I could do that, but it would take a lot of coding to make my own
> OSyncClient. That's why I simply use the full opensync library. That's
> only 10 lines of code!

I think that is what I have been trying to suggest (badly) -- thanks for the
clarification Daniel.

But, of course, Henrik, you shouldn't have to implement your own OSyncClient.
What we have to do is to make the client code and plugin support code usable
from your process, without bringing in all the rest of OpenSync. That may be
harder than it looks because some functions that plugins call may assume the
whole OpenSync environment is present.

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC][PATCH] OSYNC_START_TYPE_EXTERNAL

2009-10-29T09:23:53Z

On Thursday 29 October 2009 15:48:33 Henrik /KaarPoSoft wrote:
> As I wrote in a different thread, I am not sure if my way of
> implementing the external process is the intended one. I am simply
> running the same kind of client that would have been running inside
> osynctool, by calling the same opensync libraries. That means that
> without osync_client_get_overriding_plugin_dir the opensync library
> would load the slim mozilla-sync plugin which was intended for
> osynctool/engine, not the new fat mozilla-sync plugin intended for the
> external process.

There seem to be two possible solutions:

1) The "thin" plugin could just be replaced with a configuration file. What
does OpenSync need to know about external process plugins? Presumably pretty
much just the fact that they are external and how to contact them.

Should we add a config file to supply that info? Then opensync would just not
attempt to load any plugin for which it had already read a config file.

2) Or, the fat plugin could not really be a plugin. It could be completely up
to the caller of opensync in the external process to have the plugin code
loaded (presumably statically linked into the executable) and opensync, when
invoked to just create a client, would not load **any** plugins. There would
have to be a function to call to register a plugin by passing in the
get_plugin_info address.

I **think** this second option was how the original external code worked, but
I haven't checked the code so I might be completely wrong.

I am keen to keep the external client code as minimal as possible. In
particular, if we are every going to make IPC and timeout work properly I
certainly don't want two full IPC instances communicating -- there are enough
queues as it is!

Graham

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC] Different libraries for OSYNC_START_TYPE_EXTERNAL

2009-10-29T08:55:40Z

Daniel Gollub wrote:

> On Tuesday 27 October 2009 06:07:50 pm Henrik /KaarPoSoft wrote:
> [...]
>
>> I am working on porting mozilla-sync to use OSYNC_START_TYPE_EXTERNAL.
>>
>
> Awesome!
>
> [...]
>
>> In fact, the engine (e.g. in osynctool) will initialize a proxy, and
>> this proxy will send the name of the plugin and the path to the plugin
>> directory to the external process.
>>
>
>
> By "plugin directory" you mean the member directory of the group - right?
>
> E.g. ~/.opensync/groupX/Y/
>
> This is at what the engine uses as argument to spawn for proxy. The function
> osync_client_proxy_spawn() is then creating two pipes in this member
> directory: pluginpipe and enginepipe
>
>

No, I do mean the PLUGIN directory.
static osync_bool _osync_client_handle_initialize(OSyncClient *client,
OSyncMessage *message, OSyncError **error):
osync_message_read_string(message, &enginepipe, error);
osync_message_read_string(message, &formatdir, error);
osync_message_read_string(message, &plugindir, error);
osync_message_read_string(message, &pluginname, error);
osync_message_read_string(message, &groupname, error);
osync_message_read_string(message, &configdir, error);
osync_message_read_int(message, &haspluginconfig, error);

>
> Why don't you try this:
>
> Just write a very tiny mozilla-sync which just contains the function
> "get_sync_info"?
>
> It just registers the plugin and set the start-type to
> OSYNC_START_TYPE_EXTERNAL.
>
> So this plugin (stub) is not using any mozilla API -> no mozilla dependecies
> .... Engine doesn't load those libraries.
>
>
> The plugin stub only does one thing: register the plugin to the OSyncPluginEnv
> ... and set the name and description of the plugin, as well as that the plugin
> is an external one and needs to be started via OSYNC_START_TYPE_EXTERNAL ...
>

This is exactly what I did.
> And your real "plugin" which is acutally a complete different process - or
> even an own application is implementing a full OSyncClient and OSyncPlugin
> environment? Completeyl without that get_sync_info() stuff ...
>
I could do that, but it would take a lot of coding to make my own
OSyncClient. That's why I simply use the full opensync library. That's
only 10 lines of code!

But if you have a proof-of-concept with a full stand-alone OSyncClient
without to much code, I will certainly have a look!

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC][PATCH] OSYNC_START_TYPE_EXTERNAL

2009-10-29T08:48:33Z

Daniel Gollub wrote:

> On Wednesday 28 October 2009 10:04:43 pm Henrik /KaarPoSoft wrote:
>
>> Please let me know if anybody objects to me checking in the attached
>> combined patch for all the issues I have raised about
>> OSYNC_START_TYPE_EXTERNAL so far.
>>
>
> I like the command_start addition .. this is somethign which was really
> missing. Could you explain how you use this for mozilla-sync?
>
> Do you start mozilla if it isn't already started? Or do you trigger the sync
> via an additional command? Or both?
>

If you call the "thunderbird" program, it will start a new process if it
is not already running. I thunderbird is already running, it will simply
hand off the command line parameters to the already running instance.

The opensync client is triggered by the -mozilla-sync command line
option which I added to thunderbird.

The sync itself can be triggered by running the engine from osynctool or
from inside the blueZync plugin to Thunderbird.

> I'm still not convinced why there is need to overwrite the plugindir ... or
> maybe i didn't understand the problem. Unfortuantely exactly for the new API
> function to override the path the API documentation is missing why this is
> needed ...
>
> +OSYNC_EXPORT void osync_client_set_overriding_plugin_dir(OSyncClient *client,
> char *overriding_plugin_dir);
> +OSYNC_EXPORT char *osync_client_get_overriding_plugin_dir(OSyncClient
> *client);
> +
>

As I wrote in a different thread, I am not sure if my way of
implementing the external process is the intended one. I am simply
running the same kind of client that would have been running inside
osynctool, by calling the same opensync libraries. That means that
without osync_client_get_overriding_plugin_dir the opensync library
would load the slim mozilla-sync plugin which was intended for
osynctool/engine, not the new fat mozilla-sync plugin intended for the
external process.

/Henrik

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

Re: [RFC] Do not clone-demerge-compare, just compare taking capabilities into account

2009-10-29T07:22:36Z

On Saturday 24 October 2009 04:13:33 pm Henrik /KaarPoSoft wrote:

> Dear all,
>
> Following up on a previous thread on this list:
> >> The current logic in _osync_obj_engine_mapping_find is:
> >> Clone (i.e. make a complete copy of) change1. Demerge fields from the
> >> clone which are not in caps2.
> >> Clone (i.e. make a complete copy of) change2. Demerge fields from the
> >> clone which are not in caps1.
> >> Compare the two cloned objects.
> >> To me this seems unnecessarily complicated and incurs a performance
> >> penalty. Why is this not implemented as a more "intelligent" compare
> >> function, which takes capabilities into account?
> >
> > This is pretty new code and more or less just a proof of concept. If you
> > came up with a more efficient solution, let me know. This was the last
> > thing i was working on ... it's not completed.
>
> OK, here is a suggestion:
>
> In _osync_obj_engine_mapping_find in opensync_obj_engine.c we currently
> have something which boils down to:
>
> clone_change1 =
> _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps2,
> change1, error); clone_change2 =
> _osync_obj_engine_clone_and_demerge_change(sinkengine->engine, caps1,
> change2, error); change1 = clone_change1;
> change2 = clone_change2;
> tmp_result = osync_change_compare(change1, change2, error);
>
> This could be replaced with
>
> tmp_result = osync_change_compare(change1, change2, caps1, caps2, error);
>
> osync_change_compare and thus osync_data_compare and
> osync_objformat_compare and maybe other functions would require trivial
> changes.

Actually i hesistate to make OSyncChange OSyncData more complex ... since you
could perfeclty use this function without capabilities and stuff like that.

This would als require to break the API.

>
> It would then boil down to modifying functions like osync_objformat_compare
> to take capabilities into account (not trivial).
>
> As far as I can see, this would be a far more efficient solution.

And i don't see the advantage of performance here? You would then end up again
in calling osync_obj_engine_clone_and_demerge .. .but jsut in a different
place.

I guess if you want to reduce the numbers of clone and demerges then you need
to work higher in the stack ... e.g. at the place where
_osync_obj_engine_clone_and_dmerge gets called today ... and try to demerge
every change only once and reuse it until a mapping got found.

>
> The drawback is of course that it needs coding work (=time).
>
> However, as demerge_xmlformat needs heavy work anyway, I think this may be
> a good time to consider replacing clone-demerge-compare with a compare
> taking capabilities into account.
>
> What do you all think about this proposal?

I guess we should post-pone this ... this is "just" a perforamance
improvments, which we could still do later without breaking the API. Currently
we should concentrating in getting things working ASAP, before making them
fast ... later we can still think about how to make synchronization work with
O(1) ;)

>
> /Henrik
>
> PS: This was about demerge. I have not quite figured merge out, maybe
> somebody more knowledgeable than me could comment on this...

Merge is currently not active (due to API changes, trivial porting required.)
But the merge process is less complex, since you don't have to deal with
different combination of capabilities and changes/data.

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment

Re: [RFC] Using OSYNC_START_TYPE_EXTERNAL

2009-10-29T07:14:57Z

On Sunday 25 October 2009 10:59:55 pm Henrik /KaarPoSoft wrote:
> We could add a function called osync_plugin_set_start_external_command
> in opensync_plugin to be called from get_sync_info:

Ok, thats pretty cool! This is defenitly missing in OpenSync.

>
> This function could be passed a string in printf format (e.g.
> "start-external-process %s"), and osync_client_proxy_spawn could call
> g_strdup_printf with the pipe name as an argument, and execute the
> resulting command with g_spawn_command_line_async.
>
> I do not know about other external processes, but with blueZync plugin
> installed, if you launch "thunderbird --mozilla-sync=/path/to/pipe" it
> will create a new thunderbird instance if one is not already running,
> otherwise it will connect to the running thunderbird, which is exactly
> what we need.
>
> Comments on this would be most appreciated.

Checked your patch (different thread), looks pretty promosing!

Best Regards,
Daniel

--
Daniel Gollub Geschaeftsfuehrer: Ralph Dehner
FOSS Developer Unternehmenssitz: Vohburg
B1 Systems GmbH Amtsgericht: Ingolstadt
Mobil: +49-(0)-160 47 73 970 Handelsregister: HRB 3537
EMail: gollub@... http://www.b1-systems.de

Adresse: B1 Systems GmbH, Osterfeldstraße 7, 85088 Vohburg
http://pgpkeys.pca.dfn.de/pks/lookup?op=get&search=0xED14B95C2F8CA78D

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel

signature.asc (204 bytes) Download Attachment