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

Author: DanielRFilipov

pcompat.h

@@ -145,10 +145,11 @@ typedef unsigned long psync_uint_t;
 #define psync_stat_isfolder(s) S_ISDIR((s)->st_mode)
 #define psync_stat_size(s) ((s)->st_size)
 #ifdef _DARWIN_FEATURE_64_BIT_INODE
-#define psync_stat_ctime(s) ((s)->st_birthtime)
+#define psync_stat_birthtime(s) ((s)->st_birthtime)
 #else
-#define psync_stat_ctime(s) ((s)->st_ctime)
+#define psync_stat_birthtime(s) ((s)->st_mtime)
 #endif
+#define psync_stat_ctime(s) ((s)->st_ctime)
 #define psync_stat_mtime(s) ((s)->st_mtime)
 
 #if defined(st_mtime)
@@ -266,6 +267,7 @@ int psync_stat(const char *path, psync_stat_t *st);
 #define psync_stat_size(s) psync_32to64((s)->nFileSizeHigh, (s)->nFileSizeLow)
 #define psync_stat_ctime(s) psync_filetime_to_timet(&(s)->ftCreationTime)
 #define psync_stat_mtime(s) psync_filetime_to_timet(&(s)->ftLastWriteTime)
+#define psync_stat_birthtime(s) psync_filetime_to_timet(&(s)->ftCreationTime)
 #define psync_stat_mtime_native(s) psync_32to64((s)->ftLastWriteTime.dwHighDateTime, (s)->ftLastWriteTime.dwLowDateTime)
 #define psync_mtime_native_to_mtime(n) psync_filetime64_to_timet(n)
 #define psync_stat_inode(s) psync_32to64((s)->nFileIndexHigh, (s)->nFileIndexLow)

pfs.c

@@ -84,6 +84,11 @@ typedef off_t fuse_off_t;
 
 #if defined(P_OS_MACOSX)
 #define FS_MAX_ACCEPTABLE_FILENAME_LEN 255
+
+#if defined(_DARWIN_FEATURE_64_BIT_INODE)
+#define FUSE_STAT_HAS_BIRTHTIME
+#endif
+
 #endif
 
 #if defined(P_OS_LINUX)
@@ -427,7 +432,7 @@ void psync_fs_update_openfile_fileid_locked(psync_openfile_t *of, psync_fsfileid
 static void psync_row_to_folder_stat(psync_variant_row row, struct FUSE_STAT *stbuf){
   memset(stbuf, 0, sizeof(struct FUSE_STAT));
   stbuf->st_ino=folderid_to_inode(psync_get_number(row[0]));
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
+#ifdef FUSE_STAT_HAS_BIRTHTIME
   stbuf->st_birthtime=psync_get_number(row[2]);
   stbuf->st_ctime=psync_get_number(row[3]);
   stbuf->st_mtime=stbuf->st_ctime;
@@ -454,7 +459,7 @@ static void psync_row_to_file_stat(psync_variant_row row, struct FUSE_STAT *stbu
   if (flags&PSYNC_FOLDER_FLAG_ENCRYPTED)
     size=psync_fs_crypto_plain_size(size);
   memset(stbuf, 0, sizeof(struct FUSE_STAT));
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
+#ifdef FUSE_STAT_HAS_BIRTHTIME
   stbuf->st_birthtime=psync_get_number(row[2]);
   stbuf->st_ctime=psync_get_number(row[3]);
   stbuf->st_mtime=stbuf->st_ctime;
@@ -480,12 +485,12 @@ static void psync_mkdir_to_folder_stat(psync_fstask_mkdir_t *mk, struct FUSE_STA
     stbuf->st_ino=folderid_to_inode(mk->folderid);
   else
     stbuf->st_ino=taskid_to_inode(-mk->folderid);
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
+#ifdef FUSE_STAT_HAS_BIRTHTIME
   stbuf->st_birthtime=mk->ctime;
   stbuf->st_ctime=mk->mtime;
   stbuf->st_mtime=mk->mtime;
 #else
-  stbuf->st_ctime=mk->ctime;
+  stbuf->st_ctime=mk->mtime;
   stbuf->st_mtime=mk->mtime;
 #endif
   stbuf->st_atime=stbuf->st_mtime;
@@ -517,7 +522,7 @@ static int psync_creat_stat_fake_file(struct FUSE_STAT *stbuf){
   time_t ctime;
   memset(stbuf, 0, sizeof(struct FUSE_STAT));
   ctime=psync_timer_time();
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
+#ifdef FUSE_STAT_HAS_BIRTHTIME
   stbuf->st_birthtime=ctime;
 #endif
   stbuf->st_ctime=ctime;
@@ -611,14 +616,11 @@ static int psync_creat_local_to_file_stat(psync_fstask_creat_t *cr, struct FUSE_
   }*/
   memset(stbuf, 0, sizeof(struct FUSE_STAT));
   stbuf->st_ino=taskid_to_inode(fileid);
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
-  stbuf->st_birthtime=st.st_birthtime;
-  stbuf->st_ctime=st.st_ctime;
-  stbuf->st_mtime=st.st_mtime;
-#else
-  stbuf->st_ctime=psync_stat_ctime(&st);
-  stbuf->st_mtime=psync_stat_mtime(&st);
+#ifdef FUSE_STAT_HAS_BIRTHTIME
+  stbuf->st_birthtime=psync_stat_birthtime(&st);
 #endif
+  stbuf->st_mtime=psync_stat_mtime(&st);
+  stbuf->st_ctime=stbuf->st_mtime;
   stbuf->st_atime=stbuf->st_mtime;
   stbuf->st_mode=S_IFREG | 0644;
   stbuf->st_nlink=1;
@@ -648,7 +650,7 @@ static int psync_creat_static_to_file_stat(psync_fstask_creat_t *cr, struct FUSE
   lc=psync_fstask_creat_get_local(cr);
   memset(stbuf, 0, sizeof(struct FUSE_STAT));
   stbuf->st_ino=cr->taskid;
-#ifdef _DARWIN_FEATURE_64_BIT_INODE
+#ifdef FUSE_STAT_HAS_BIRTHTIME
   stbuf->st_birthtime=lc->ctime;
   stbuf->st_ctime=lc->ctime;
   stbuf->st_mtime=lc->ctime;

pfsupload.c

@@ -1680,15 +1680,20 @@ static void psync_fsupload_check_tasks(){
 }
 
 static void psync_fsupload_thread(){
+  int waited;
   clean_stuck_tasks();
+  waited=0;
   while (psync_do_run){
     psync_wait_statuses_array(requiredstatusesnooverquota, ARRAY_SIZE(requiredstatusesnooverquota));
     // it is better to sleep a bit to give a chance for events to accumulate
-    psync_milisleep(10);
+    if (waited)
+      psync_milisleep(100);
     psync_fsupload_check_tasks();
     pthread_mutex_lock(&upload_mutex);
-    while (!upload_wakes)
+    while (!upload_wakes){
       pthread_cond_wait(&upload_cond, &upload_mutex);
+      waited=1;
+    }
     upload_wakes=0;
     pthread_mutex_unlock(&upload_mutex);
   }