Add NaClChromeMainInitForNonSfi

src/trusted/service_runtime/nacl_all_modules.c

Index: src/trusted/service_runtime/nacl_all_modules.c
diff --git a/src/trusted/service_runtime/nacl_all_modules.c b/src/trusted/service_runtime/nacl_all_modules.c
index 1617229662e75218dff8d08f69579b45946e4ff1..0b1b97ac7e947106cf34a0717dd82df6bb2512c4 100644
--- a/src/trusted/service_runtime/nacl_all_modules.c
+++ b/src/trusted/service_runtime/nacl_all_modules.c
@@ -17,7 +17,7 @@
 #include "native_client/src/trusted/service_runtime/nacl_tls.h"
 #include "native_client/src/trusted/service_runtime/nacl_stack_safety.h"
 
-void  NaClAllModulesInit(void) {
+void NaClAllModulesInit(void) {
   NaClNrdAllModulesInit();
   NaClFaultInjectionModuleInit();
   NaClGlobalModuleInit();  /* various global variables */
@@ -27,6 +27,11 @@ void  NaClAllModulesInit(void) {
   NaClThreadNiceInit();
 }
 
+void NaClAllModulesInitForNonSfi(void) {

[Mark Seaborn, 2014/03/28 14:09:45]

Just call whatever Init functions you need directly on the Chrome side.  You can
change include_rules accordingly -- it's OK to whitelist things like SRPC since
src/trusted/plugin already uses that.  (SRPC will go away in the long term so
we're not trying to clean up the embedding interface NaCl provides for it.)

This list of Init functions doesn't belong in the NaCl repo because the code
using the facilities you're initialising isn't in the NaCl repo.

[hamaji, 2014/04/01 07:10:38]

I remembered a reason we need to call NaClChromeMainInit in Chrome side.
NaClChromeMainArgsCreate has CHECK(g_initialized) and as this is a file static
variable, we need to modify NaCl repository to set g_initialized and get rid of
NaClTlsInit.

Alternative solutions:

- Remove CHECK(g_initialized) from NaClChromeMainArgsCreate.
- Copy NaClChromeMainArgsCreate to chrome side for non-SFI.

I assume the last option is OK? I'll make a CL to see if you like this.

[hamaji, 2014/04/01 07:59:32]

I guess we don't need to call NaClChromeMainArgsCreate at all... Let me see.

+  NaClNrdAllModulesInit();
+  NaClGlobalModuleInit();  /* various global variables */

[Mark Seaborn, 2014/03/28 14:09:45]

I doubt you need this one.

[hamaji, 2014/04/01 07:10:38]

Removed.

[hamaji, 2014/04/01 07:59:32]

This comment was just a mistake...

+  NaClSrpcModuleInit();
+}
 
 void NaClAllModulesFini(void) {
   NaClTlsFini();
@@ -34,3 +39,9 @@ void NaClAllModulesFini(void) {
   NaClGlobalModuleFini();
   NaClNrdAllModulesFini();
 }
+
+void NaClAllModulesFiniForNonSfi(void) {
+  NaClSrpcModuleFini();
+  NaClGlobalModuleFini();
+  NaClNrdAllModulesFini();
+}