Changeset 23542

Timestamp:

03/06/08 16:20:27 (9 months ago)

Author:

zarzycki@…

Message:

Misc.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (1 diff)
• launchd_runtime.c (modified) (4 diffs)
• launchd_runtime.h (modified) (1 diff)
• liblaunch.c (modified) (12 diffs)

trunk/launchd/src/launchd.c

@@ -107 +107 @@
 main(int argc, char *const *argv)
 {
+        const char *stdouterr_path = low_level_debug ? _PATH_CONSOLE : _PATH_DEVNULL;
         bool sflag = false;
         int ch;
 
         testfd_or_openfd(STDIN_FILENO, _PATH_DEVNULL, O_RDONLY);
-        testfd_or_openfd(STDOUT_FILENO, _PATH_DEVNULL, O_WRONLY);
-        testfd_or_openfd(STDERR_FILENO, _PATH_DEVNULL, O_WRONLY);
+        testfd_or_openfd(STDOUT_FILENO, stdouterr_path, O_WRONLY);
+        testfd_or_openfd(STDERR_FILENO, stdouterr_path, O_WRONLY);
 
         while ((ch = getopt(argc, argv, "s")) != -1) {

trunk/launchd/src/launchd_runtime.c

@@ -125 +125 @@
 bool pid1_magic;
 bool do_apple_internal_logging;
+bool low_level_debug;
 
 
@@ -136 +137 @@
 
 static int internal_mask_pri = LOG_UPTO(LOG_NOTICE);
-//static int internal_mask_pri = LOG_UPTO(LOG_DEBUG);
 
 
@@ -1206 +1206 @@
 
         vsnprintf(newmsg, sizeof(newmsg), message, args);
+
+        if (unlikely(low_level_debug)) {
+                fprintf(stderr, "%s %u\t%s %u\t%s\n", attr->from_name, attr->from_pid,
+                                attr->about_name, attr->about_pid, newmsg);
+        }
+
         logmsg_add(attr, saved_errno, newmsg);
 }
@@ -1651 +1657 @@
                 do_apple_internal_logging = true;
         }
-}
+
+        if (stat("/var/db/.debug_launchd", &sb) == 0) {
+                internal_mask_pri = LOG_UPTO(LOG_DEBUG);
+                low_level_debug = true;
+        }
+}

trunk/launchd/src/launchd_runtime.h

@@ -106 +106 @@
 extern bool pid1_magic;
 extern bool do_apple_internal_logging;
+extern bool low_level_debug;
 
 INTERNAL_ABI mach_port_t runtime_get_kernel_port(void);

trunk/launchd/src/liblaunch.c

@@ -733 +733 @@
 }
 
-int launchd_msg_send(launch_t lh, launch_data_t d)
+int
+launchd_msg_send(launch_t lh, launch_data_t d)
 {
         struct launch_msg_header lmh;
@@ -949 +950 @@
 }
 
-int launchd_msg_recv(launch_t lh, void (*cb)(launch_data_t, void *), void *context)
+int
+launchd_msg_recv(launch_t lh, void (*cb)(launch_data_t, void *), void *context)
 {
         struct cmsghdr *cm = alloca(4096); 
@@ -1040 +1042 @@
 }
 
-launch_data_t launch_data_copy(launch_data_t o)
+launch_data_t
+launch_data_copy(launch_data_t o)
 {
         launch_data_t r = launch_data_alloc(o->type);
@@ -1091 +1094 @@
 }
 
-static int _fd(int fd)
+int
+_fd(int fd)
 {
         if (fd >= 0)
@@ -1098 +1102 @@
 }
 
-launch_data_t launch_data_new_errno(int e)
+launch_data_t
+launch_data_new_errno(int e)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_ERRNO);
@@ -1108 +1113 @@
 }
 
-launch_data_t launch_data_new_fd(int fd)
+launch_data_t
+launch_data_new_fd(int fd)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_FD);
@@ -1118 +1124 @@
 }
 
-launch_data_t launch_data_new_machport(mach_port_t p)
+launch_data_t
+launch_data_new_machport(mach_port_t p)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_MACHPORT);
@@ -1128 +1135 @@
 }
 
-launch_data_t launch_data_new_integer(long long n)
+launch_data_t
+launch_data_new_integer(long long n)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_INTEGER);
@@ -1138 +1146 @@
 }
 
-launch_data_t launch_data_new_bool(bool b)
+launch_data_t
+launch_data_new_bool(bool b)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_BOOL);
@@ -1148 +1157 @@
 }
 
-launch_data_t launch_data_new_real(double d)
+launch_data_t
+launch_data_new_real(double d)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_REAL);
@@ -1158 +1168 @@
 }
 
-launch_data_t launch_data_new_string(const char *s)
+launch_data_t
+launch_data_new_string(const char *s)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_STRING);
@@ -1173 +1184 @@
 }
 
-launch_data_t launch_data_new_opaque(const void *o, size_t os)
+launch_data_t
+launch_data_new_opaque(const void *o, size_t os)
 {
         launch_data_t r = launch_data_alloc(LAUNCH_DATA_OPAQUE);