| Index: src/trusted/service_runtime/sel_ldr.h
|
| diff --git a/src/trusted/service_runtime/sel_ldr.h b/src/trusted/service_runtime/sel_ldr.h
|
| index 03bda134bac5242eab3ff5b25da2e2b8903c4cf1..5383ca6ce06ab4032d2fc01e551275f5befc2f3e 100644
|
| --- a/src/trusted/service_runtime/sel_ldr.h
|
| +++ b/src/trusted/service_runtime/sel_ldr.h
|
| @@ -624,13 +624,6 @@ struct NaClAppThread *NaClGetThreadMu(struct NaClApp *nap,
|
|
|
| void NaClAppInitialDescriptorHookup(struct NaClApp *nap);
|
|
|
| -void NaClCreateServiceSocket(struct NaClApp *nap);
|
| -
|
| -void NaClSetUpBootstrapChannel(struct NaClApp *nap,
|
| - NaClHandle inherited_desc);
|
| -
|
| -void NaClSecureCommandChannel(struct NaClApp *nap);
|
| -
|
| /*
|
| * Loads the |nexe| as a NaCl app module.
|
| * The |load_cb| callback is invoked before the the |nexe| is loaded to allow
|
| @@ -654,31 +647,8 @@ void NaClAppStartModule(struct NaClApp *self,
|
| void NaClAppShutdown(struct NaClApp *self,
|
| int exit_status);
|
|
|
| -NaClErrorCode NaClWaitForLoadModuleCommand(struct NaClApp *nap) NACL_WUR;
|
| -
|
| NaClErrorCode NaClGetLoadStatus(struct NaClApp *nap) NACL_WUR;
|
|
|
| -NaClErrorCode NaClWaitForStartModuleCommand(struct NaClApp *nap) NACL_WUR;
|
| -
|
| -/*
|
| - * NaClBlockIfCommandChannelExists is used during error exit. If
|
| - * there is a secure command channel, we sent an RPC reply with the
|
| - * reason that the nexe was rejected. If we exit immediately, that
|
| - * reply may still be in-flight and the various channel closure (esp
|
| - * reverse channels, if those were set up) may be detected first by
|
| - * the controlling process on the other end of the command channel or
|
| - * reverse channel. When channel closure wins the race against the
|
| - * RPC reply, it would result in a crash being reported, rather than
|
| - * the error code carried in the RPC reply. We want to ensure that
|
| - * the RPC reply to get processed. Instead of allowing the service
|
| - * runtime process to exit, we block the main thread and wait for the
|
| - * hard-shutdown on the command channel or command channel closure.
|
| - *
|
| - * If there is no command channel, NaClBlockIfCommandChannelExists
|
| - * just returns immediately.
|
| - */
|
| -void NaClBlockIfCommandChannelExists(struct NaClApp *nap);
|
| -
|
| void NaClFillMemoryRegionWithHalt(void *start, size_t size);
|
|
|
| void NaClFillTrampolineRegion(struct NaClApp *nap);
|
|
|