August 2008 - launchd-changes - lists.macosforge.org

[23689] branches/PR-6045086/launchd/src
by source_changes＠macosforge.org 22 Aug '08

22 Aug '08

Revision: 23689 http://trac.macosforge.org/projects/launchd/changeset/23689 Author: dsorresso(a)apple.com Date: 2008-08-21 19:32:06 -0700 (Thu, 21 Aug 2008) Log Message: ----------- Added some more debugging, turned libgmalloc on. Modified Paths: -------------- branches/PR-6045086/launchd/src/launchd.c branches/PR-6045086/launchd/src/launchd_runtime.c Modified: branches/PR-6045086/launchd/src/launchd.c =================================================================== --- branches/PR-6045086/launchd/src/launchd.c 2008-08-21 22:34:45 UTC (rev 23688) +++ branches/PR-6045086/launchd/src/launchd.c 2008-08-22 02:32:06 UTC (rev 23689) @@ -115,7 +115,7 @@ testfd_or_openfd(STDOUT_FILENO, stdouterr_path, O_WRONLY); testfd_or_openfd(STDERR_FILENO, stdouterr_path, O_WRONLY); -#if 0 +#if 1 if (pid1_magic) { if (!getenv("DYLD_INSERT_LIBRARIES")) { setenv("DYLD_INSERT_LIBRARIES", "/usr/lib/libgmalloc.dylib", 1); Modified: branches/PR-6045086/launchd/src/launchd_runtime.c =================================================================== --- branches/PR-6045086/launchd/src/launchd_runtime.c 2008-08-21 22:34:45 UTC (rev 23688) +++ branches/PR-6045086/launchd/src/launchd_runtime.c 2008-08-22 02:32:06 UTC (rev 23689) @@ -626,6 +626,14 @@ runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END); #if 1 } else { + if( malloc_size(kevi->udata) ) { + runtime_syslog(LOG_DEBUG, "malloc_size(kevi->udata) = %u\n", (unsigned int)malloc_size(kevi->udata)); + } + + if( dladdr(kevi->udata, &dli) ) { + runtime_syslog(LOG_DEBUG, "dli->dli_fname = %s, dli->dli_fbase = %p, dli->dli_sname = %s, dli->dli_saddr = %p", dli.dli_fname, dli.dli_fbase, dli.dli_sname, dli.dli_saddr); + } + log_kevent_struct(LOG_EMERG, kevi, 0); } #endif

1 0

[23688] branches/PR-6045086/trunk/
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23688 http://trac.macosforge.org/projects/launchd/changeset/23688 Author: dsorresso(a)apple.com Date: 2008-08-21 15:34:45 -0700 (Thu, 21 Aug 2008) Log Message: ----------- Removing extraneous branch. Removed Paths: ------------- branches/PR-6045086/trunk/

1 0

[23687] branches/PR-6045086/trunk/
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23687 http://trac.macosforge.org/projects/launchd/changeset/23687 Author: dsorresso(a)apple.com Date: 2008-08-21 15:31:12 -0700 (Thu, 21 Aug 2008) Log Message: ----------- Creating branch PR-6045086 for rdar://problem/6045086. Added Paths: ----------- branches/PR-6045086/trunk/ Copied: branches/PR-6045086/trunk (from rev 23686, trunk)

1 0

[23686] branches/PR-5898404/launchd/src/libvproc.c
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23686 http://trac.macosforge.org/projects/launchd/changeset/23686 Author: dsorresso(a)apple.com Date: 2008-08-20 22:11:24 -0700 (Wed, 20 Aug 2008) Log Message: ----------- Fixed an error code return. Modified Paths: -------------- branches/PR-5898404/launchd/src/libvproc.c Modified: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-21 03:16:26 UTC (rev 23685) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-21 05:11:24 UTC (rev 23686) @@ -646,13 +646,11 @@ break; case VPROC_GSK_TRANSACTIONS_ENABLED: /* Shared memory region is required for transactions. */ - if (unlikely(vproc_shmem == NULL)) { - fprintf(stderr, "Initializing shmem...\n"); + if( unlikely(vproc_shmem == NULL) ) { int po_r = pthread_once(&shmem_inited, vproc_shmem_init); - if (po_r != 0 || vproc_shmem == NULL) { - fprintf(stderr, "pthread_once(): %d, vproc_shmem = %p\n", po_r, vproc_shmem); + if( po_r != 0 || vproc_shmem == NULL ) { if( outval ) { - *outval = 0; + *outval = -1; } return (vproc_err_t)vproc_swap_integer; }

1 0

[23685] branches/PR-5898404/launchd/src/libvproc.c
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23685 http://trac.macosforge.org/projects/launchd/changeset/23685 Author: dsorresso(a)apple.com Date: 2008-08-20 20:16:26 -0700 (Wed, 20 Aug 2008) Log Message: ----------- Fixed a bug exposed by the other bug I was investigating. Modified Paths: -------------- branches/PR-5898404/launchd/src/libvproc.c Modified: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-21 01:08:33 UTC (rev 23684) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-21 03:16:26 UTC (rev 23685) @@ -647,10 +647,14 @@ case VPROC_GSK_TRANSACTIONS_ENABLED: /* Shared memory region is required for transactions. */ if (unlikely(vproc_shmem == NULL)) { + fprintf(stderr, "Initializing shmem...\n"); int po_r = pthread_once(&shmem_inited, vproc_shmem_init); if (po_r != 0 || vproc_shmem == NULL) { - *outval = 0; - return NULL; + fprintf(stderr, "pthread_once(): %d, vproc_shmem = %p\n", po_r, vproc_shmem); + if( outval ) { + *outval = 0; + } + return (vproc_err_t)vproc_swap_integer; } }

1 0

[23684] branches/PR-5898404/launchd/src/protocol_job_reply.defs
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23684 http://trac.macosforge.org/projects/launchd/changeset/23684 Author: dsorresso(a)apple.com Date: 2008-08-20 18:08:33 -0700 (Wed, 20 Aug 2008) Log Message: ----------- Removing unnecessary (and potentially harmful) skip in job reply protocol. Modified Paths: -------------- branches/PR-5898404/launchd/src/protocol_job_reply.defs Modified: branches/PR-5898404/launchd/src/protocol_job_reply.defs =================================================================== --- branches/PR-5898404/launchd/src/protocol_job_reply.defs 2008-08-21 01:06:14 UTC (rev 23683) +++ branches/PR-5898404/launchd/src/protocol_job_reply.defs 2008-08-21 01:08:33 UTC (rev 23684) @@ -35,8 +35,6 @@ skip; /* register */ -skip; /* transaction_optin */ - skip; /* look_up */ simpleroutine job_mig_send_signal_reply(

1 0

[23683] branches/PR-5898404/launchd/src
by source_changes＠macosforge.org 21 Aug '08

21 Aug '08

Revision: 23683 http://trac.macosforge.org/projects/launchd/changeset/23683 Author: dsorresso(a)apple.com Date: 2008-08-20 18:06:14 -0700 (Wed, 20 Aug 2008) Log Message: ----------- Rolled transaction SPI into vproc_swap_integer(). Modified Paths: -------------- branches/PR-5898404/launchd/src/launchd_core_logic.c branches/PR-5898404/launchd/src/libvproc.c branches/PR-5898404/launchd/src/libvproc_private.h branches/PR-5898404/launchd/src/protocol_job.defs Modified: branches/PR-5898404/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-20 08:31:44 UTC (rev 23682) +++ branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-21 01:06:14 UTC (rev 23683) @@ -6017,6 +6017,10 @@ *outval = oldmask; umask(oldmask); break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + job_log(j, LOG_DEBUG, "Reading transaction model status."); + *outval = j->kill_via_shmem; + break; case 0: *outval = 0; break; @@ -6081,6 +6085,15 @@ umask((mode_t) inval); } break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + if( !job_assumes(j, inval != 0) ) { + job_log(j, LOG_WARNING, "Attempt to unregister from transaction model. This is not supported."); + kr = 1; + } else { + job_log(j, LOG_DEBUG, "Now participating in transaction model."); + j->kill_via_shmem = (bool)inval; + job_log(j, LOG_DEBUG, "j->kill_via_shmem = %s", j->kill_via_shmem ? "YES" : "NO"); + } case 0: break; default: @@ -6424,20 +6437,6 @@ } kern_return_t -job_mig_transaction_register(job_t job, uint64_t flags __attribute__((unused))) -{ - job_log(job, LOG_DEBUG, "Request to be opted into transaction model."); - - if( !job->kill_via_shmem ) { - job->kill_via_shmem = 1; - } else { - job_log(job, LOG_NOTICE, "Attempt to re-register for transaction model."); - } - - return KERN_SUCCESS; -} - -kern_return_t job_mig_look_up2(job_t j, mach_port_t srp, name_t servicename, mach_port_t *serviceportp, pid_t target_pid, uint64_t flags) { struct machservice *ms; Modified: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-20 08:31:44 UTC (rev 23682) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-21 01:06:14 UTC (rev 23683) @@ -56,6 +56,7 @@ static int64_t cached_pid = -1; static struct vproc_shmem_s *vproc_shmem; static pthread_once_t shmem_inited = PTHREAD_ONCE_INIT; +static uint64_t s_cached_transactions_enabled = 0; static void vproc_shmem_init(void) @@ -181,18 +182,6 @@ } } -vproc_err_t _vproc_transaction_optin(void) -{ - if (unlikely(vproc_shmem == NULL)) { - int po_r = pthread_once(&shmem_inited, vproc_shmem_init); - if (po_r != 0 || vproc_shmem == NULL) { - return; - } - } - - return vproc_mig_transaction_register(bootstrap_port, 0)); -} - vproc_standby_t vproc_standby_begin(vproc_t vp __attribute__((unused))) { @@ -655,6 +644,21 @@ return NULL; } break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + /* Shared memory region is required for transactions. */ + if (unlikely(vproc_shmem == NULL)) { + int po_r = pthread_once(&shmem_inited, vproc_shmem_init); + if (po_r != 0 || vproc_shmem == NULL) { + *outval = 0; + return NULL; + } + } + + if( s_cached_transactions_enabled && outval ) { + *outval = s_cached_transactions_enabled; + return NULL; + } + break; default: break; } @@ -667,6 +671,10 @@ case VPROC_GSK_IS_MANAGED: cached_is_managed = outval ? *outval : dummyval; break; + case VPROC_GSK_TRANSACTIONS_ENABLED: + /* Once you're in the transaction model, you're in for good. Like the Mafia. */ + s_cached_transactions_enabled = 1; + break; default: break; } Modified: branches/PR-5898404/launchd/src/libvproc_private.h =================================================================== --- branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-20 08:31:44 UTC (rev 23682) +++ branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-21 01:06:14 UTC (rev 23683) @@ -51,6 +51,7 @@ VPROC_GSK_GLOBAL_LOG_MASK, VPROC_GSK_GLOBAL_UMASK, VPROC_GSK_ABANDON_PROCESS_GROUP, + VPROC_GSK_TRANSACTIONS_ENABLED } vproc_gsk_t; vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval); @@ -87,7 +88,6 @@ void _vproc_transaction_try_exit(int status); void _vproc_transaction_begin(void); void _vproc_transaction_end(void); -vproc_err_t _vproc_transaction_optin(void); size_t _vproc_transaction_count(void); Modified: branches/PR-5898404/launchd/src/protocol_job.defs =================================================================== --- branches/PR-5898404/launchd/src/protocol_job.defs 2008-08-20 08:31:44 UTC (rev 23682) +++ branches/PR-5898404/launchd/src/protocol_job.defs 2008-08-21 01:06:14 UTC (rev 23683) @@ -62,10 +62,6 @@ __service_port : mach_port_t; __flags : uint64_t); -routine transaction_optin( - __bs_port : job_t; - __flags : uint64_t); - routine look_up2( __bs_port : job_t; sreplyport __rport : mach_port_make_send_once_t;

1 0

[23682] branches/PR-5898404/launchd/src
by source_changes＠macosforge.org 20 Aug '08

20 Aug '08

Revision: 23682 http://trac.macosforge.org/projects/launchd/changeset/23682 Author: dsorresso(a)apple.com Date: 2008-08-20 01:31:44 -0700 (Wed, 20 Aug 2008) Log Message: ----------- Added vproc_transaction_optin() SPI. buildit isn't working from home, so I don't know if these changes compile/work yet. Modified Paths: -------------- branches/PR-5898404/launchd/src/launchd_core_logic.c branches/PR-5898404/launchd/src/libvproc.c branches/PR-5898404/launchd/src/libvproc_private.h branches/PR-5898404/launchd/src/protocol_job.defs branches/PR-5898404/launchd/src/protocol_job_reply.defs Modified: branches/PR-5898404/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-20 02:19:07 UTC (rev 23681) +++ branches/PR-5898404/launchd/src/launchd_core_logic.c 2008-08-20 08:31:44 UTC (rev 23682) @@ -6424,6 +6424,20 @@ } kern_return_t +job_mig_transaction_register(job_t job, uint64_t flags __attribute__((unused))) +{ + job_log(job, LOG_DEBUG, "Request to be opted into transaction model."); + + if( !job->kill_via_shmem ) { + job->kill_via_shmem = 1; + } else { + job_log(job, LOG_NOTICE, "Attempt to re-register for transaction model."); + } + + return KERN_SUCCESS; +} + +kern_return_t job_mig_look_up2(job_t j, mach_port_t srp, name_t servicename, mach_port_t *serviceportp, pid_t target_pid, uint64_t flags) { struct machservice *ms; Modified: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-20 02:19:07 UTC (rev 23681) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-20 08:31:44 UTC (rev 23682) @@ -181,9 +181,16 @@ } } -void _vproc_transaction_optin(void) +vproc_err_t _vproc_transaction_optin(void) { + if (unlikely(vproc_shmem == NULL)) { + int po_r = pthread_once(&shmem_inited, vproc_shmem_init); + if (po_r != 0 || vproc_shmem == NULL) { + return; + } + } + return vproc_mig_transaction_register(bootstrap_port, 0)); } vproc_standby_t Modified: branches/PR-5898404/launchd/src/libvproc_private.h =================================================================== --- branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-20 02:19:07 UTC (rev 23681) +++ branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-20 08:31:44 UTC (rev 23682) @@ -87,7 +87,7 @@ void _vproc_transaction_try_exit(int status); void _vproc_transaction_begin(void); void _vproc_transaction_end(void); -void _vproc_transaction_optin(void); +vproc_err_t _vproc_transaction_optin(void); size_t _vproc_transaction_count(void); Modified: branches/PR-5898404/launchd/src/protocol_job.defs =================================================================== --- branches/PR-5898404/launchd/src/protocol_job.defs 2008-08-20 02:19:07 UTC (rev 23681) +++ branches/PR-5898404/launchd/src/protocol_job.defs 2008-08-20 08:31:44 UTC (rev 23682) @@ -62,6 +62,10 @@ __service_port : mach_port_t; __flags : uint64_t); +routine transaction_optin( + __bs_port : job_t; + __flags : uint64_t); + routine look_up2( __bs_port : job_t; sreplyport __rport : mach_port_make_send_once_t; Modified: branches/PR-5898404/launchd/src/protocol_job_reply.defs =================================================================== --- branches/PR-5898404/launchd/src/protocol_job_reply.defs 2008-08-20 02:19:07 UTC (rev 23681) +++ branches/PR-5898404/launchd/src/protocol_job_reply.defs 2008-08-20 08:31:44 UTC (rev 23682) @@ -35,6 +35,8 @@ skip; /* register */ +skip; /* transaction_optin */ + skip; /* look_up */ simpleroutine job_mig_send_signal_reply(

1 0

[23681] branches/PR-5898404/launchd/src
by source_changes＠macosforge.org 20 Aug '08

20 Aug '08

Revision: 23681 http://trac.macosforge.org/projects/launchd/changeset/23681 Author: dsorresso(a)apple.com Date: 2008-08-19 19:19:07 -0700 (Tue, 19 Aug 2008) Log Message: ----------- Added placeholder code. Nothing's been defined yet. Modified Paths: -------------- branches/PR-5898404/launchd/src/libvproc.c branches/PR-5898404/launchd/src/libvproc_private.h Modified: branches/PR-5898404/launchd/src/libvproc.c =================================================================== --- branches/PR-5898404/launchd/src/libvproc.c 2008-08-20 01:19:03 UTC (rev 23680) +++ branches/PR-5898404/launchd/src/libvproc.c 2008-08-20 02:19:07 UTC (rev 23681) @@ -181,6 +181,11 @@ } } +void _vproc_transaction_optin(void) +{ + +} + vproc_standby_t vproc_standby_begin(vproc_t vp __attribute__((unused))) { Modified: branches/PR-5898404/launchd/src/libvproc_private.h =================================================================== --- branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-20 01:19:03 UTC (rev 23680) +++ branches/PR-5898404/launchd/src/libvproc_private.h 2008-08-20 02:19:07 UTC (rev 23681) @@ -87,6 +87,7 @@ void _vproc_transaction_try_exit(int status); void _vproc_transaction_begin(void); void _vproc_transaction_end(void); +void _vproc_transaction_optin(void); size_t _vproc_transaction_count(void);

1 0

[23680] branches/PR-5898404/
by source_changes＠macosforge.org 20 Aug '08

20 Aug '08

Revision: 23680 http://trac.macosforge.org/projects/launchd/changeset/23680 Author: dsorresso(a)apple.com Date: 2008-08-19 18:19:03 -0700 (Tue, 19 Aug 2008) Log Message: ----------- Creating branch PR-5898404 for rdar://problem/5898404. Added Paths: ----------- branches/PR-5898404/ Copied: branches/PR-5898404 (from rev 23679, trunk)

1 0