Revision: 23936 http://trac.macosforge.org/projects/launchd/changeset/23936 Author: dsorresso@apple.com Date: 2009-10-07 13:08:49 -0700 (Wed, 07 Oct 2009) Log Message: ----------- Checkpoint. Modified Paths: -------------- branches/PR-7178164/launchd/src/launchd_core_logic.c Modified: branches/PR-7178164/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7178164/launchd/src/launchd_core_logic.c 2009-09-26 21:45:45 UTC (rev 23935) +++ branches/PR-7178164/launchd/src/launchd_core_logic.c 2009-10-07 20:08:49 UTC (rev 23936) @@ -93,7 +93,10 @@ typedef struct jetsam_priority_entry { pid_t pid; uint32_t flags; - uint32_t memlimit; + int32_t hiwat_pages; + int32_t hiwat_reserved1; + int32_t hiwat_reserved2; + int32_t hiwat_reserved3; } jetsam_priority_entry_t; enum { @@ -9001,7 +9004,7 @@ launch_data_t memlimit = 0; if( !(memlimit = launch_data_dict_lookup(ldi, LAUNCH_JOBKEY_JETSAMMEMORYLIMIT)) || launch_data_get_type(frontmost) != LAUNCH_DATA_INTEGER ) { - ji->jetsam_memlimit = 0; + ji->jetsam_memlimit = -1; continue; } ji->jetsam_memlimit = (uint32_t)launch_data_get_integer(memlimit); @@ -9028,7 +9031,7 @@ for( i = 0; i < totalpris; i++ ) { jpris[i].pid = jobs[i]->p; jpris[i].flags |= jobs[i]->jetsam_frontmost ? kJetsamFlagsFrontmost : 0; - jpris[i].memlimit = jobs[i]->jetsam_memlimit; + jpris[i].hiwat_pages = jobs[i]->jetsam_memlimit; } int _result = 0;