update uwproj

[mizunara.git] / mizucp / main.c

diff --git a/mizucp/main.c b/mizucp/main.c
index 5fb1e8b..f590dc7 100644 (file)
--- a/mizucp/main.c
+++ b/mizucp/main.c
@@ -23,9 +23,11 @@
 #include "main.h"
 
 #include "srvctrl.h"
+#include "atomic.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
@@ -61,6 +63,13 @@ static MZQueue         *queue_end;
 
 static int scan_complete;
 
+
+static uint64_t stat_num_files;
+static uint64_t stat_copied_files;
+static uint64_t stat_error_files;
+static uint64_t stat_total_size;
+static uint64_t stat_copied_size;
+
 int main(int argc, char** argv) { 
     int ret = 1;
     
@@ -298,6 +307,7 @@ void* scan_run(void *data) {
             SrcFile *f = calloc(1, sizeof(SrcFile));
             f->path = util_concat_path(elm->path, name);
             f->isdir = S_ISDIR(s.st_mode);
+            f->size = s.st_size;
             f->mode = s.st_mode;
             f->depends_on = elm;
             
@@ -305,6 +315,10 @@ void* scan_run(void *data) {
                 // TODO: error?
                 fprintf(stderr, "enqueue failed\n");
                 break;
+            } else {
+                mz_atomic_inc64(&stat_num_files);
+                int64_t sz = s.st_size;
+                mz_atomic_add64(&stat_total_size, sz);
             }
             
             // put dir on stack
@@ -423,11 +437,36 @@ void* copy_run(void *data) {
             to[to_len-1] = 0;
         }
         
+        if(file->depends_on) {
+            SrcFile *dep = file->depends_on;
+            // check first without lock
+            if(dep->status == 0) {
+                if(dep->lock) {
+                    pthread_mutex_lock(&dep->lock->mutex);
+                    if(file->depends_on->status == 0) {
+                        pthread_cond_wait(&dep->lock->cond, &dep->lock->mutex);
+                    }
+                    pthread_mutex_unlock(&dep->lock->mutex);
+                } else {
+                    // locking disabled (because we have only one thread)
+                    // but in that case the file status can't be 0
+                    // therefore this case here should not happen
+                    file->status = -1;
+                }
+            }
+            // check again
+            if(dep->status == -1) {
+                file->status = -1;
+            }
+        }
+        
         int ret;
-        if(file->isdir) {
+        if(file->status == 0) {
+            if(file->isdir) {
             ret = mz_copy_dir(settings, file, from, to);
-        } else {
-            ret = mz_copy_file(settings, file, from, to, buffer, bufsize);
+            } else {
+                ret = mz_copy_file(settings, file, from, to, buffer, bufsize);
+            }
         }
         
         free(to);
@@ -439,15 +478,39 @@ void* copy_run(void *data) {
     return NULL;
 }
 
+static void file_set_status(SrcFile *file, int status) {
+    if(file->lock) {
+        pthread_mutex_lock(&file->lock->mutex);
+        file->status = status;
+        pthread_cond_broadcast(&file->lock->cond);
+        pthread_mutex_unlock(&file->lock->mutex);
+    } else {
+        file->status = status;
+    }
+}
+
 int mz_copy_dir(CPSettings *settings, SrcFile *file, const char *from, const char *to) {
     printf("mkdir %s\n", to);
-    return mkdir(to, file->mode);
+    int ret = mkdir(to, file->mode);
+    if(ret) {
+        if(errno == EEXIST) {
+            struct stat s;
+            if(!stat(to, &s)) {
+                if(S_ISDIR(s.st_mode)) {
+                    ret = 0;
+                }
+            }
+        }
+    }
+    file_set_status(file, !ret ? 1 : -1);
+    return ret;
 }
 
 int mz_copy_file(CPSettings *settings, SrcFile *file, const char *from, const char *to, char *buffer, size_t bufsize) {
     printf("cp %s %s\n", from, to);
     int fin = open(from, O_RDONLY);
     if(fin < 0) {
+        file_set_status(file, -1);
         return 1;
     }
     
@@ -457,12 +520,19 @@ int mz_copy_file(CPSettings *settings, SrcFile *file, const char *from, const ch
     if(fout < 0) {
         perror("open");
         close(fin);
+        file_set_status(file, -1);
         return 1;
     }
     
+    int64_t copied = 0;
     ssize_t r;
     while((r = read(fin, buffer, bufsize)) > 0) {
-        if(write(fout, buffer, r) != r) {
+        ssize_t w = write(fout, buffer, r);
+        if(w > 0) {
+            mz_atomic_add64(&stat_copied_size, w);
+            copied += w;
+        }
+        if(w != r) {
             ret = 1;
             break;
         }
@@ -471,5 +541,23 @@ int mz_copy_file(CPSettings *settings, SrcFile *file, const char *from, const ch
     close(fin);
     close(fout);
     
+    if(!ret) {
+        file_set_status(file, 1);
+        mz_atomic_inc64(&stat_copied_files);
+        if(copied != file->size) {
+            // size changed after scan -> readjust total size
+            int64_t filesz_diff = copied - file->size;
+            mz_atomic_add64(&stat_total_size, filesz_diff);
+        }
+    } else {
+        file_set_status(file, -1);
+        mz_atomic_inc64(&stat_error_files);
+        if(copied != file->size) {
+            // count the full file size as copied, although we had an error
+            int64_t filesz_diff = file->size - copied;
+            mz_atomic_add64(&stat_copied_size, filesz_diff);
+        }
+    }
+    
     return ret;
 }