Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-fifo.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

• branches/3.0/mondo/src/common/libmondo-fifo.c (modified) (3 diffs)

branches/3.0/mondo/src/common/libmondo-fifo.c

@@ -85 +85 @@
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
-    sync();
+    paranoid_system("sync");
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        mr_asprintf(tmp,"dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c", internal_tape_block_size, bufsize, 'm');
+        mr_asprintf(tmp,
+                "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
+                internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
         mr_free(tmp);
@@ -94 +96 @@
     if (!res) {
         bufsize++;
-        log_to_screen(tmp, "Negotiated max buffer of %d MB ", bufsize);
+        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
+        log_to_screen(tmp);
+        mr_free(tmp);
     } else {
         bufsize = 0;
@@ -162 +166 @@
         return;
     }
-    sync();
+    paranoid_system("sync");
     mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);