debug

Author: virco

Makefile

@@ -5,7 +5,7 @@ RANLIB=ranlib
 USESSL=mbed
 
 #CFLAGS=-Wall -Wpointer-arith -O2 -g -fsanitize=address -mtune=core2
-CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2
+CFLAGS=-Wall -Wpointer-arith -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2 -I../sqlite
 #CFLAGS=-O2 -g -pg
 
 LIB_A=psynclib.a

pfs.c

@@ -235,8 +235,11 @@ int psync_fs_update_openfile(uint64_t taskid, uint64_t writeid, psync_fileid_t n
   psync_sql_bind_uint(res, 1, taskid);
   if ((row=psync_sql_fetch_rowint(res)) && row[0]==writeid)
     ret=0;
-  else
+  else{
+    if (row)
+      debug(D_NOTICE, "writeid of fileid %ld differs %lu!=%lu", (long)fileid, (unsigned long)row[0], (unsigned long)writeid);
     ret=-1;
+  }
   psync_sql_free_result(res);
   psync_sql_unlock();
   return ret;

pfsupload.c

@@ -385,7 +385,7 @@ static int save_meta(const binresult *meta, psync_folderid_t folderid, const cha
   psync_sql_bind_uint(sql, 2, writeid);
   psync_sql_run_free(sql);
   if (!psync_sql_affected_rows()){
-    debug(D_BUG, "upload of %s cancelled due to writeid mismatch, psync_fs_update_openfile should have catched that", name);
+    debug(D_BUG, "upload of %s cancelled due to writeid mismatch, writeid %lu, psync_fs_update_openfile should have catched that", name, (long unsigned)writeid);
     psync_sql_rollback_transaction();
     return -1;
   }
@@ -767,7 +767,7 @@ int upload_modify(uint64_t taskid, psync_folderid_t folderid, const char *name,
   psync_file_t fd;
   psync_fs_err_t err;
   int ret;
-  debug(D_NOTICE, "uploading modified file %s as %lu/%s", filename, (unsigned long)folderid, name);
+  debug(D_NOTICE, "uploading modified file %s writeid %lu as %lu/%s", filename, (unsigned long)writeid, (unsigned long)folderid, name);
   asize=0;
   fd=psync_file_open(indexname, P_O_RDONLY, 0);
   if (unlikely(fd==INVALID_HANDLE_VALUE)){

ppagecache.c

@@ -3023,7 +3023,7 @@ static void psync_pagecache_add_task(uint32_t type, uint64_t taskid, uint64_t ha
   psync_sql_res *res;
   int run;
   // TODO: remove this check
-  if (type==PAGE_TASK_TYPE_MODIFY){
+/*  if (type==PAGE_TASK_TYPE_MODIFY){
     res=psync_sql_prep_statement("DELETE FROM fstaskdepend WHERE dependfstaskid=?");
     psync_sql_bind_uint(res, 1, taskid);
     psync_sql_run_free(res);
@@ -3033,7 +3033,7 @@ static void psync_pagecache_add_task(uint32_t type, uint64_t taskid, uint64_t ha
     psync_sql_bind_uint(res, 1, taskid);
     psync_sql_run_free(res);
     return;
-  }
+  }*/
   run=0;
   res=psync_sql_prep_statement("INSERT INTO pagecachetask (type, taskid, hash, oldhash) VALUES (?, ?, ?, ?)");
   psync_sql_bind_uint(res, 1, type);