Changeset 23359

Timestamp:

09/06/07 15:24:34 (15 months ago)

Author:

zarzycki@…

Message:

Create a wrapper around fsync().

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (1 diff)
• launchd_runtime.c (modified) (1 diff)
• launchd_runtime.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -4493 +4493 @@
 
         if (logfile_fd != -1) {
-                job_assumes(j, fcntl(logfile_fd, F_FULLFSYNC, 0) != -1);
+                job_assumes(j, runtime_fsync(logfile_fd) != -1);
                 job_assumes(j, runtime_close(logfile_fd) != -1);
         }

trunk/launchd/src/launchd_runtime.c

@@ -1037 +1037 @@
 {
         if (ourlogfile) {
-                fflush(ourlogfile);
-
-                if (debug_shutdown_hangs) {
-                        fcntl(fileno(ourlogfile), F_FULLFSYNC, NULL);
-                }
+                launchd_assumes(fflush(ourlogfile) == 0);
+                launchd_assumes(runtime_fsync(fileno(ourlogfile)) != -1);
+        }
+}
+
+int
+runtime_fsync(int fd)
+{
+        if (debug_shutdown_hangs) {
+                return fcntl(fd, F_FULLFSYNC, NULL);
+        } else {
+                return fsync(fd);
         }
 }

trunk/launchd/src/launchd_runtime.h

@@ -62 +62 @@
 
 int runtime_close(int fd);
+int runtime_fsync(int fd);
 
 void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to);