Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-fifo.c

Timestamp:

Sep 25, 2013, 8:55:45 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Lots of memory management backports from 3.1 to 3.2 - still not finished, nor working ATM. the common subdir was done during travel, so this is essentially a backup !

File:

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

branches/3.2/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;
-    paranoid_system("sync");
+    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);
@@ -96 +94 @@
     if (!res) {
         bufsize++;
-        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen(tmp, "Negotiated max buffer of %d MB ", bufsize);
     } else {
         bufsize = 0;
@@ -166 +162 @@
         return;
     }
-    paranoid_system("sync");
+    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);