[launchd-changes] [23732] branches/PR-6248586
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 16 14:37:42 PDT 2008
Revision: 23732
http://trac.macosforge.org/projects/launchd/changeset/23732
Author: kvv at apple.com
Date: 2008-10-16 14:37:41 -0700 (Thu, 16 Oct 2008)
Log Message:
-----------
fixed bug with exc_server (don't use libSystem copy)
Modified Paths:
--------------
branches/PR-6248586/launchd/src/launchd_runtime.c
branches/PR-6248586/launchd.xcodeproj/project.pbxproj
Modified: branches/PR-6248586/launchd/src/launchd_runtime.c
===================================================================
--- branches/PR-6248586/launchd/src/launchd_runtime.c 2008-10-16 20:26:33 UTC (rev 23731)
+++ branches/PR-6248586/launchd/src/launchd_runtime.c 2008-10-16 21:37:41 UTC (rev 23732)
@@ -61,7 +61,7 @@
#include "launchd_internalServer.h"
#include "launchd_internal.h"
#include "notifyServer.h"
-#include "mach_excServer.h"
+#include "excServer.h"
/* We shouldn't be including these */
#include "launch.h"
@@ -848,8 +848,6 @@
return r;
}
-boolean_t mach_exc_server(mach_msg_header_t *, mach_msg_header_t *);
-
boolean_t
launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply)
{
@@ -858,7 +856,7 @@
} else if (notify_server_routine(Request)) {
return notify_server(Request, Reply);
} else {
- return mach_exc_server(Request, Reply);
+ return exc_server(Request, Reply);
}
}
@@ -1467,30 +1465,9 @@
}
kern_return_t
-catch_mach_exception_raise(mach_port_t exception_port,
- mach_port_t thread, mach_port_t task, exception_type_t exception,
- mach_exception_data_t code, mach_msg_type_number_t codeCnt);
-
-kern_return_t
-catch_mach_exception_raise_state(mach_port_t exception_port,
- exception_type_t exception,
- const mach_exception_data_t code, mach_msg_type_number_t codeCnt,
- int *flavor,
- const thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
- thread_state_t new_state, mach_msg_type_number_t *new_stateCnt);
-
-kern_return_t
-catch_mach_exception_raise_state_identity(mach_port_t exception_port,
- mach_port_t thread, mach_port_t task, exception_type_t exception,
- mach_exception_data_t code, mach_msg_type_number_t codeCnt,
- int *flavor,
- thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
- thread_state_t new_state, mach_msg_type_number_t *new_stateCnt);
-
-kern_return_t
-catch_mach_exception_raise(mach_port_t exception_port __attribute__((unused)),
+catch_exception_raise(mach_port_t exception_port __attribute__((unused)),
mach_port_t thread, mach_port_t task,
- exception_type_t exception, mach_exception_data_t code,
+ exception_type_t exception, exception_data_t code,
mach_msg_type_number_t codeCnt)
{
runtime_syslog(LOG_NOTICE, "%s(): thread: 0x%x task: 0x%x type: 0x%x code: %p codeCnt: 0x%x",
@@ -1503,9 +1480,9 @@
}
kern_return_t
-catch_mach_exception_raise_state(mach_port_t exception_port __attribute__((unused)),
+catch_exception_raise_state(mach_port_t exception_port __attribute__((unused)),
exception_type_t exception,
- const mach_exception_data_t code, mach_msg_type_number_t codeCnt,
+ const exception_data_t code, mach_msg_type_number_t codeCnt,
int *flavor,
const thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
thread_state_t new_state, mach_msg_type_number_t *new_stateCnt)
@@ -1520,10 +1497,10 @@
}
kern_return_t
-catch_mach_exception_raise_state_identity(mach_port_t exception_port __attribute__((unused)),
+catch_exception_raise_state_identity(mach_port_t exception_port __attribute__((unused)),
mach_port_t thread, mach_port_t task,
exception_type_t exception,
- mach_exception_data_t code, mach_msg_type_number_t codeCnt,
+ exception_data_t code, mach_msg_type_number_t codeCnt,
int *flavor,
thread_state_t old_state, mach_msg_type_number_t old_stateCnt,
thread_state_t new_state, mach_msg_type_number_t *new_stateCnt)
Modified: branches/PR-6248586/launchd.xcodeproj/project.pbxproj
===================================================================
--- branches/PR-6248586/launchd.xcodeproj/project.pbxproj 2008-10-16 20:26:33 UTC (rev 23731)
+++ branches/PR-6248586/launchd.xcodeproj/project.pbxproj 2008-10-16 21:37:41 UTC (rev 23732)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 42;
objects = {
/* Begin PBXAggregateTarget section */
@@ -37,6 +37,7 @@
/* Begin PBXBuildFile section */
721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; };
+ 72B71B7D0EA7E98A00BFE986 /* exc.defs in Sources */ = {isa = PBXBuildFile; fileRef = FC36291F0E9349410054F1A3 /* exc.defs */; settings = {ATTRIBUTES = (Server, ); }; };
FC3627BA0E9343220054F1A3 /* StartupItems.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A0FD0E8C8ADF00D41150 /* StartupItems.c */; };
FC3627BB0E93432A0054F1A3 /* SystemStarter.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A1000E8C8ADF00D41150 /* SystemStarter.c */; };
FC3627D40E93439B0054F1A3 /* StartupItemContext.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FC59A0FE0E8C8ADF00D41150 /* StartupItemContext.8 */; };
@@ -519,7 +520,6 @@
isa = PBXNativeTarget;
buildConfigurationList = FC59A0590E8C884800D41150 /* Build configuration list for PBXNativeTarget "launchd" */;
buildPhases = (
- FC3629500E934F8E0054F1A3 /* ShellScript */,
FC59A0510E8C884700D41150 /* Sources */,
FC59A0520E8C884700D41150 /* Frameworks */,
FC7B87FA0EA71AB400542082 /* CopyFiles */,
@@ -655,22 +655,6 @@
/* End PBXProject section */
/* Begin PBXShellScriptBuildPhase section */
- FC3629500E934F8E0054F1A3 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- "$(DERIVED_FILE_DIR)/mach_excServer.c",
- "$(DERIVED_FILE_DIR)/mach_excServer.h",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "/usr/bin/mig $MIGFLAGS \\\n\t-header /dev/null \\\n\t-user /dev/null \\\n\t-server \"$DERIVED_FILE_DIR\"/mach_excServer.c \\\n\t-sheader \"$DERIVED_FILE_DIR\"/mach_excServer.h \\\n\t\"$SDKROOT\"/usr/include/mach/exc.defs";
- showEnvVarsInLog = 0;
- };
FC7B87B20EA7195F00542082 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
@@ -765,6 +749,7 @@
FC59A0BF0E8C8A2A00D41150 /* launchd_internal.defs in Sources */,
FC3627E10E9344BF0054F1A3 /* protocol_vproc.defs in Sources */,
FC3629170E9348390054F1A3 /* protocol_job_reply.defs in Sources */,
+ 72B71B7D0EA7E98A00BFE986 /* exc.defs in Sources */,
FC36290D0E93475F0054F1A3 /* notify.defs in Sources */,
FC59A0C50E8C8A4700D41150 /* launchd.c in Sources */,
FC59A0BA0E8C8A1F00D41150 /* launchd_runtime.c in Sources */,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20081016/e15a942e/attachment-0001.html
More information about the launchd-changes
mailing list