Optimized show_progress() to reduce the calls to gettimeofday() when

am_server is set.  No need to check do_progress here anymore, since
we aren't called if do_progress isn't set.

diff --git a/progress.c b/progress.c
index e842b9a..083b6df 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -79,39 +79,43 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
 
 void end_progress(OFF_T size)
 {
-       extern int do_progress, am_server;
+       extern int am_server;
 
-       if (do_progress && !am_server) {
-               struct timeval now;
-                gettimeofday(&now, NULL);
-                rprint_progress(size, size, &now, True);
+       if (!am_server) {
+               struct timeval now;
+               gettimeofday(&now, NULL);
+               rprint_progress(size, size, &now, True);
        }
        last_ofs   = 0;
-        start_ofs  = 0;
-        print_time.tv_sec  = print_time.tv_usec  = 0;
-        start_time.tv_sec  = start_time.tv_usec  = 0;
+       start_ofs  = 0;
+       print_time.tv_sec  = print_time.tv_usec  = 0;
+       start_time.tv_sec  = start_time.tv_usec  = 0;
 }
 
 void show_progress(OFF_T ofs, OFF_T size)
 {
-       extern int do_progress, am_server;
-        struct timeval now;
+       extern int am_server;
+       struct timeval now;
 
-        gettimeofday(&now, NULL);
-
-        if (!start_time.tv_sec && !start_time.tv_usec) {
-               start_time.tv_sec  = now.tv_sec;
-                start_time.tv_usec = now.tv_usec;
-                start_ofs          = ofs;
-        }
+       if (!start_time.tv_sec) {
+               gettimeofday(&now, NULL);
+               start_time.tv_sec  = now.tv_sec;
+               start_time.tv_usec = now.tv_usec;
+               start_ofs          = ofs;
+               if (am_server)
+                       return;
+       }
+       else {
+               if (am_server)
+                       return;
+               gettimeofday(&now, NULL);
+       }
 
-       if (do_progress
-            && !am_server
-            && ofs > last_ofs + 1000
-            && msdiff(&print_time, &now) > 250) {
-               rprint_progress(ofs, size, &now, False);
-                last_ofs = ofs;
-                print_time.tv_sec  = now.tv_sec;
-                print_time.tv_usec = now.tv_usec;
+       if (ofs > last_ofs + 1000
+        && msdiff(&print_time, &now) > 250) {
+               rprint_progress(ofs, size, &now, False);
+               last_ofs = ofs;
+               print_time.tv_sec  = now.tv_sec;
+               print_time.tv_usec = now.tv_usec;
        }
 }