openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File csync-ppc.patch of Package csync (Revision 0dc78e13f078fa1a0b829fa47422267b)

Currently displaying revision 0dc78e13f078fa1a0b829fa47422267b , Show latest

From e9cfa4e6104f5a997cb462a92198d24b038bc9b0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 27 Jun 2008 16:12:26 +0200
Subject: [PATCH] Remove accidently commited debug message.

Signed-off-by: Andreas Schneider <mail@cynapses.org>
---
 src/csync_propagate.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/csync_propagate.c b/src/csync_propagate.c
index c3c3672..f623053 100644
--- a/src/csync_propagate.c
+++ b/src/csync_propagate.c
@@ -181,9 +181,6 @@ static int _csync_push_file(CSYNC *ctx, csync_file_stat_t *st) {
 
     ctx->replica = drep;
     bwritten = csync_vio_write(ctx, dfp, buf, bread);
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-        "file: %s, command: write, bread = %d, bwritten = %d - %s",
-        turi, bread, bwritten, strerror(errno));
 
     if (bwritten < 0 || bread != bwritten) {
       CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR,
-- 
1.5.4.5

From cde1a6b9cce3f0afed13963a31b03446be535f5b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 27 Jun 2008 17:58:32 +0200
Subject: [PATCH] Fix segfault on PPC.

The phash (uint64_t) needs to be represented as %llu on PPC or it
segfaults.

Signed-off-by: Andreas Schneider <mail@cynapses.org>
---
 src/csync_journal.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/csync_journal.c b/src/csync_journal.c
index 5d33229..3a70722 100644
--- a/src/csync_journal.c
+++ b/src/csync_journal.c
@@ -277,9 +277,12 @@ static int _insert_metadata_visitor(void *obj, void *data) {
   ctx = (CSYNC *) data;
 
   if (fs->instruction != CSYNC_INSTRUCTION_DELETED) {
+    /*
+     * The phash needs to be %llu or it segfaults on PPC
+     */
     stmt = sqlite3_mprintf("INSERT INTO metadata_temp"
       "(phash, pathlen, path, inode, uid, gid, mode, modtime) VALUES"
-      "(%lu, %d, '%q', %d, %d, %d, %d, %lu);",
+      "(%llu, %u, '%q', %u, %u, %u, %u, %lu);",
       fs->phash,
       fs->pathlen,
       fs->path,
-- 
1.5.4.5

From 076c7fb819569826160691f85d8c5838cf0621da Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Fri, 27 Jun 2008 18:01:19 +0200
Subject: [PATCH] More code cleanup for PPC.

Signed-off-by: Andreas Schneider <mail@cynapses.org>
---
 src/csync.c           |   12 ++++++------
 src/csync_reconcile.c |    2 +-
 src/csync_update.c    |    8 +++++---
 src/csync_util.c      |    4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/csync.c b/src/csync.c
index 779f1a4..4eac02c 100644
--- a/src/csync.c
+++ b/src/csync.c
@@ -53,7 +53,7 @@ static int _key_cmp(const void *key, const void *data) {
   uint64_t a;
   csync_file_stat_t *b;
 
-  a = (uint64_t) key;
+  a = *(uint64_t *) (key);
   b = (csync_file_stat_t *) data;
 
   if (a < b->phash) {
@@ -211,7 +211,7 @@ int csync_init(CSYNC *ctx) {
 
   /* create/load journal */
   if (! csync_is_journal_disabled(ctx)) {
-    if (asprintf(&ctx->journal.file, "%s/csync_journal_%lu.db", ctx->options.config_dir,
+    if (asprintf(&ctx->journal.file, "%s/csync_journal_%llu.db", ctx->options.config_dir,
           c_jhash64((uint8_t *) ctx->remote.uri, strlen(ctx->remote.uri), 0)) < 0) {
       rc = -1;
       goto out;
@@ -359,7 +359,7 @@ int csync_reconcile(CSYNC *ctx) {
   clock_gettime(CLOCK_REALTIME, &finish);
 
   CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-            "Reconciliation for local replica took %.2f seconds visiting %llu files.",
+            "Reconciliation for local replica took %.2f seconds visiting %lu files.",
             c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
 
   if (rc < 0) {
@@ -377,7 +377,7 @@ int csync_reconcile(CSYNC *ctx) {
   clock_gettime(CLOCK_REALTIME, &finish);
 
   CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-            "Reconciliation for remote replica took %.2f seconds visiting %llu files.",
+            "Reconciliation for remote replica took %.2f seconds visiting %lu files.",
             c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
 
   if (rc < 0) {
@@ -409,7 +409,7 @@ int csync_propagate(CSYNC *ctx) {
   clock_gettime(CLOCK_REALTIME, &finish);
 
   CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-            "Propagation for local replica took %.2f seconds visiting %llu files.",
+            "Propagation for local replica took %.2f seconds visiting %lu files.",
             c_secdiff(finish, start), c_rbtree_size(ctx->local.tree));
 
   if (rc < 0) {
@@ -427,7 +427,7 @@ int csync_propagate(CSYNC *ctx) {
   clock_gettime(CLOCK_REALTIME, &finish);
 
   CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-            "Propagation for remote replica took %.2f seconds visiting %llu files.",
+            "Propagation for remote replica took %.2f seconds visiting %lu files.",
             c_secdiff(finish, start), c_rbtree_size(ctx->remote.tree));
 
   if (rc < 0) {
diff --git a/src/csync_reconcile.c b/src/csync_reconcile.c
index 944cbd6..5e65460 100644
--- a/src/csync_reconcile.c
+++ b/src/csync_reconcile.c
@@ -49,7 +49,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
       break;
   }
 
-  node = c_rbtree_find(tree, (void *) cur->phash);
+  node = c_rbtree_find(tree, &cur->phash);
   /* file only found on current replica */
   if (node == NULL) {
     switch(cur->instruction) {
diff --git a/src/csync_update.c b/src/csync_update.c
index 3de15aa..4d57bb4 100644
--- a/src/csync_update.c
+++ b/src/csync_update.c
@@ -44,6 +44,7 @@
 static int _csync_detect_update(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs, const int type) {
   uint64_t h = 0;
   size_t len = 0;
+  size_t size = 0;
   const char *path = NULL;
   csync_file_stat_t *st = NULL;
   csync_file_stat_t *tmp = NULL;
@@ -74,13 +75,14 @@ static int _csync_detect_update(CSYNC *ctx, const char *file, const csync_vio_fi
   }
 
   h = c_jhash64((uint8_t *) path, len, 0);
+  size = sizeof(csync_file_stat_t) + len + 1;
 
-  st = c_malloc(sizeof(csync_file_stat_t) + len + 1);
+  st = c_malloc(size);
   if (st == NULL) {
     return -1;
   }
-  CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - hash %lu, stat %d",
-      path, h, sizeof(csync_file_stat_t) + len + 1);
+  CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - hash %lu, st size: %d",
+      path, h, size);
 
   /* check hardlink count */
   if (type == CSYNC_FTW_TYPE_FILE && fs->nlink > 1) {
diff --git a/src/csync_util.c b/src/csync_util.c
index ee71252..1cb7165 100644
--- a/src/csync_util.c
+++ b/src/csync_util.c
@@ -118,7 +118,7 @@ static int _merge_file_trees_visitor(void *obj, void *data) {
   }
 
   /* check if the file is new or has been synced */
-  node = c_rbtree_find(ctx->local.tree, (void *) fs->phash);
+  node = c_rbtree_find(ctx->local.tree, &fs->phash);
   if (node == NULL) {
     csync_file_stat_t *new = NULL;
 
@@ -135,7 +135,7 @@ static int _merge_file_trees_visitor(void *obj, void *data) {
       goto out;
     }
 
-    node = c_rbtree_find(ctx->local.tree, (void *) fs->phash);
+    node = c_rbtree_find(ctx->local.tree, &fs->phash);
     if (node == NULL) {
       rc = -1;
       goto out;
-- 
1.5.4.5

Places

File csync-ppc.patch of Package csync (Revision 0dc78e13f078fa1a0b829fa47422267b)

Places