Merge branch 'master' of gitlab.pcloud.com:pcloud/synclib

Author: Ivan Stoev

pfs.c

@@ -3018,6 +3018,20 @@ char *psync_fs_get_path_by_folderid(psync_folderid_t folderid){
   return ret;
 }
 
+#if IS_DEBUG
+
+static void psync_fs_dump_internals() {
+  psync_openfile_t *of;
+  debug(D_NOTICE, "dumping internal state");
+  psync_sql_rdlock();
+  psync_tree_for_each_element(of, openfiles, psync_openfile_t, tree)
+    debug(D_NOTICE, "open file %s fileid %ld folderid %ld", of->currentname, (long)of->fileid, (long)of->currentfolder->folderid);
+  psync_fstask_dump_state();
+  psync_sql_rdunlock();
+}
+
+#endif
+
 static void psync_fs_do_stop(void){
   struct timespec ts;
   debug(D_NOTICE, "stopping");
@@ -3040,6 +3054,9 @@ static void psync_fs_do_stop(void){
       debug(D_NOTICE, "timeouted waiting for fuse to exit");
     else
       debug(D_NOTICE, "waited for fuse to exit");
+#if IS_DEBUG
+    psync_fs_dump_internals();
+#endif
   }
   pthread_mutex_unlock(&start_mutex);
 }
@@ -3051,11 +3068,18 @@ void psync_fs_stop(){
 #if defined(P_OS_POSIX)
 
 static void psync_signal_handler(int sig){
-  debug(D_NOTICE, "got signal %d\n", sig);
+  debug(D_NOTICE, "got signal %d", sig);
   psync_fs_do_stop();
   exit(1);
 }
 
+#if IS_DEBUG
+static void psync_usr1_handler(int sig){
+//  debug(D_NOTICE, "got signal %d", sig);
+  psync_run_thread("dump signal", psync_fs_dump_internals);
+}
+#endif
+
 static void psync_set_signal(int sig, void (*handler)(int)){
   struct sigaction sa;
 
@@ -3075,6 +3099,9 @@ static void psync_setup_signals(){
   psync_set_signal(SIGTERM, psync_signal_handler);
   psync_set_signal(SIGINT, psync_signal_handler);
   psync_set_signal(SIGHUP, psync_signal_handler);
+#if IS_DEBUG
+  psync_set_signal(SIGUSR1, psync_usr1_handler);
+#endif
 }
 
 #endif
@@ -3138,6 +3165,7 @@ static int psync_fs_do_start(){
 //  fuse_opt_add_arg(&args, "-ouse_ino");
   fuse_opt_add_arg(&args, "-ofsname="DEFAULT_FUSE_MOUNT_POINT".fs");
   fuse_opt_add_arg(&args, "-ononempty");
+  fuse_opt_add_arg(&args, "-ohard_remove");
 #endif
 #if defined(P_OS_MACOSX)
   fuse_opt_add_arg(&args, "argv");
@@ -3147,6 +3175,7 @@ static int psync_fs_do_start(){
   if (psync_user_is_admin())
     fuse_opt_add_arg(&args, "-oallow_root");
   fuse_opt_add_arg(&args, "-onolocalcaches");
+  fuse_opt_add_arg(&args, "-ohard_remove");
 #endif
 
   memset(&psync_oper, 0, sizeof(psync_oper));

pfstasks.c

@@ -40,8 +40,6 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#define FOLDER_HASH 256
-
 typedef struct {
   psync_folderid_t folderid;
   char name[];
@@ -50,10 +48,6 @@ typedef struct {
 static psync_tree *folders=PSYNC_TREE_EMPTY;
 static uint64_t psync_local_taskid=UINT64_MAX;
 
-psync_uint_t folder_hash(psync_fsfolderid_t folderid){
-  return ((uint64_t)folderid)%FOLDER_HASH;
-}
-
 psync_fstask_folder_t *psync_fstask_get_or_create_folder_tasks(psync_fsfolderid_t folderid){
   psync_fstask_folder_t *folder;
   psync_sql_lock();
@@ -880,10 +874,11 @@ int psync_fstask_unlink(psync_fsfolderid_t folderid, const char *name){
     psync_sql_run_free(res);
   }
   else{
-    res=psync_sql_prep_statement("INSERT INTO fstask (type, status, folderid, fileid, text1) VALUES ("NTO_STR(PSYNC_FS_TASK_UNLINK)", 0, ?, ?, ?)");
-    psync_sql_bind_int(res, 1, folderid);
-    psync_sql_bind_int(res, 2, fileid);
-    psync_sql_bind_lstring(res, 3, name, len);
+    res=psync_sql_prep_statement("INSERT INTO fstask (type, status, folderid, fileid, text1) VALUES ("NTO_STR(PSYNC_FS_TASK_UNLINK)", ?, ?, ?, ?)");
+    psync_sql_bind_int(res, 1, fileid<0?11:0);
+    psync_sql_bind_int(res, 2, folderid);
+    psync_sql_bind_int(res, 3, fileid);
+    psync_sql_bind_lstring(res, 4, name, len);
     psync_sql_run_free(res);
   }
   taskid=psync_sql_insertid();
@@ -1842,3 +1837,38 @@ void psync_fstask_init(){
   psync_sql_free_result(res);
   psync_fsupload_init();
 }
+
+#if IS_DEBUG
+
+void psync_fstask_dump_state(){
+  psync_fstask_folder_t *folder;
+  psync_fstask_mkdir_t *mk;
+  psync_fstask_rmdir_t *rm;
+  psync_fstask_creat_t *cr;
+  psync_fstask_unlink_t *un;
+  uint32_t cnt;
+  psync_tree_for_each_element(folder, folders, psync_fstask_folder_t, tree){
+    debug(D_NOTICE, "open folderid %ld taskcnt %u refcnt %u", (long)folder->folderid, (unsigned)folder->taskscnt, (unsigned)folder->refcnt);
+    cnt=0;
+    psync_tree_for_each_element(mk, folder->mkdirs, psync_fstask_mkdir_t, tree){
+      debug(D_NOTICE, "  mkdir %s folderid %ld taskid %lu", mk->name, (long)mk->folderid, (unsigned long)mk->taskid);
+      cnt++;
+    }
+    psync_tree_for_each_element(rm, folder->rmdirs, psync_fstask_rmdir_t, tree){
+      debug(D_NOTICE, "  mkdir %s folderid %ld taskid %lu", rm->name, (long)rm->folderid, (unsigned long)rm->taskid);
+      cnt++;
+    }
+    psync_tree_for_each_element(cr, folder->creats, psync_fstask_creat_t, tree){
+      debug(D_NOTICE, "  creat %s fileid %ld taskid %lu", cr->name, (long)cr->fileid, (unsigned long)cr->taskid);
+      cnt++;
+    }
+    psync_tree_for_each_element(un, folder->unlinks, psync_fstask_unlink_t, tree){
+      debug(D_NOTICE, "  unlink %s fileid %ld taskid %lu", un->name, (long)un->fileid, (unsigned long)un->taskid);
+      cnt++;
+    }
+    if (cnt!=folder->taskscnt)
+      debug(D_ERROR, "inconsistency found, counted taskcnt %u != taskcnt %u", (unsigned)cnt, (unsigned)folder->taskscnt);
+  }
+}
+
+#endif

pfstasks.h

@@ -31,6 +31,7 @@
 #include "pfsfolder.h"
 #include "ptree.h"
 #include "psynclib.h"
+#include "plibs.h"
 #include <time.h>
 #include <stddef.h>
 #include <string.h>
@@ -157,4 +158,8 @@ void psync_fstask_clean();
 
 void psync_fstask_add_banned_folders();
 
+#if IS_DEBUG
+void psync_fstask_dump_state();
+#endif
+
 #endif

pfsupload.c

@@ -1348,7 +1348,7 @@ static int psync_cancel_task_modify(fsupload_task_t *task){
 
 static int psync_cancel_task_unlink(fsupload_task_t *task){
   psync_sql_res *res;
-  if (unlikely_log(task->fileid>0)){
+  if (unlikely_log((psync_fsfileid_t)task->fileid>0)){
     res=psync_sql_prep_statement("UPDATE fstask SET status=0 WHERE id=?");
     psync_sql_bind_uint(res, 1, task->id);
     upload_wakes++;

psynclib.c

@@ -1567,7 +1567,6 @@ static int psync_upload_params(binparam *params, size_t paramcnt, const void *da
   } while (++tries<=PSYNC_RETRY_REQUEST);
   psync_timer_notify_exception();
   return -1;
-
 }
 
 int psync_upload_data(psync_folderid_t folderid, const char *remote_filename, const void *data, size_t length, psync_fileid_t *fileid){