Revision: 23222 http://trac.macosforge.org/projects/launchd/changeset/23222 Author: zarzycki@apple.com Date: 2007-04-16 15:33:31 -0700 (Mon, 16 Apr 2007) Log Message: ----------- Miscellaneous fixes. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-04-16 20:23:04 UTC (rev 23221) +++ trunk/launchd/src/launchd_core_logic.c 2007-04-16 22:33:31 UTC (rev 23222) @@ -2121,8 +2121,6 @@ return; } - job_log(j, LOG_DEBUG, "Starting"); - j->sent_sigterm_time.tv_sec = 0; j->sent_sigterm_time.tv_usec = 0; @@ -2130,7 +2128,6 @@ sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices)); } - j->checkedin = false; if (sipc) { @@ -2178,6 +2175,8 @@ job_start_child(j); break; default: + job_log(j, LOG_DEBUG, "Started as PID: %u", c); + total_children++; LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle); @@ -3299,7 +3298,7 @@ void machservice_watch(job_t j, struct machservice *ms) { - if (job_assumes(j, ms->recv)) { + if (ms->recv) { job_assumes(j, runtime_add_mport(ms->port, NULL, 0) == KERN_SUCCESS); } } Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-04-16 20:23:04 UTC (rev 23221) +++ trunk/launchd/src/launchd_runtime.c 2007-04-16 22:33:31 UTC (rev 23222) @@ -132,8 +132,8 @@ launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); - openlog(getprogname(), LOG_PID|LOG_CONS, LOG_LAUNCHD); - setlogmask(LOG_UPTO(/* LOG_DEBUG */ LOG_NOTICE)); + runtime_openlog(getprogname(), LOG_PID|LOG_CONS, LOG_LAUNCHD); + runtime_setlogmask(LOG_UPTO(/* LOG_DEBUG */ LOG_NOTICE)); } void *