Non-SFI mode: Build ppapi libraries for nacl_helper_nonsfi.

ppapi/nacl_irt/irt_ppapi.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <unistd.h>
 
+#include "build/build_config.h"
 #include "native_client/src/public/irt_core.h"
 #include "native_client/src/trusted/service_runtime/include/sys/unistd.h"
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/irt/irt_private.h"
 #include "ppapi/nacl_irt/irt_manifest.h"
 #include "ppapi/nacl_irt/irt_ppapi.h"
 #include "ppapi/nacl_irt/plugin_main.h"
 #include "ppapi/nacl_irt/public/irt_ppapi.h"
 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h"
 
 static struct PP_StartFunctions g_pp_functions;
 
 int irt_ppapi_start(const struct PP_StartFunctions* funcs) {
+#if !defined(OS_NACL_NONSFI)

[Mark Seaborn, 2014/10/28 21:57:23]

If you're going to add a conditional, please add a comment explaining why it's
here, plus maybe a TODO if you plan to remove g_is_main_thread.

   // Disable NaCl's open_resource() interface on this thread.
   g_is_main_thread = 1;

[hidehiko, 2014/10/28 20:14:00]

FYI: Is this flag still needed? IIUC, this is no longer used.
If unnecessary, I'm happy to work on its removal in a separate CL.

[Mark Seaborn, 2014/10/28 21:57:23]

Yeah, it is no longer checked by open_resource() since we switched to the
Chrome-IPC-based implementation.

It would be good to remove it.  It would also be good to add a test to check
that open_resource() works on the main thread after PPAPI has been initialised. 
(In the original SRPC implementation, it didn't work, which was the reason for
checking g_is_main_thread to give a graceful error instead of deadlocking.)

[hidehiko, 2014/10/29 06:00:14]

Ok. +1 for adding the test. Let me look into it later. Added TODO.

+#endif
 
   g_pp_functions = *funcs;
   return PpapiPluginMain();
 }
 
 int32_t PPP_InitializeModule(PP_Module module_id,
                              PPB_GetInterface get_browser_interface) {
   return g_pp_functions.PPP_InitializeModule(module_id, get_browser_interface);
 }
 
 void PPP_ShutdownModule(void) {
   g_pp_functions.PPP_ShutdownModule();
 }
 
 const void* PPP_GetInterface(const char* interface_name) {
   return g_pp_functions.PPP_GetInterface(interface_name);
 }
 
 static const struct nacl_irt_ppapihook nacl_irt_ppapihook = {
   irt_ppapi_start,
   PpapiPluginRegisterThreadCreator,
 };
 
+#if defined(OS_NACL_SFI)
 static int ppapihook_pnacl_private_filter(void) {
   int pnacl_mode = sysconf(NACL_ABI__SC_NACL_PNACL_MODE);
   if (pnacl_mode == -1)
     return 0;
   return pnacl_mode;
 }
+#endif
 
 static const nacl_irt_resource_open kIrtResourceOpen = {
   ppapi::IrtOpenResource,
 };
 
 static int not_pnacl_filter(void) {

[Mark Seaborn, 2014/10/28 21:57:23]

How come the compiler doesn't warn about this being unused when compiling for
Non-SFI mode?  Is this actually getting compiled?  Are warnings enabled
properly?

[hidehiko, 2014/10/29 06:00:14]

Good catch. Guarded by #ifdef.
We have -Wno-unused-function so it is expected behavior.
(pls find it in pnacl_compiler_flags in native_client/build/untrusted.gypi and
build/common.gypi, i.e. it is defined in two places).

   int pnacl_mode = sysconf(NACL_ABI__SC_NACL_PNACL_MODE);
   if (pnacl_mode == -1)
     return 0;
   return !pnacl_mode;
 }
 
 static const struct nacl_irt_interface irt_interfaces[] = {
   { NACL_IRT_PPAPIHOOK_v0_1, &nacl_irt_ppapihook, sizeof(nacl_irt_ppapihook),
     NULL },
+#if defined(OS_NACL_SFI)
   { NACL_IRT_PPAPIHOOK_PNACL_PRIVATE_v0_1,
     &nacl_irt_ppapihook_pnacl_private, sizeof(nacl_irt_ppapihook_pnacl_private),
     ppapihook_pnacl_private_filter },
+#endif
   { NACL_IRT_RESOURCE_OPEN_v0_1, &kIrtResourceOpen,
-    sizeof(kIrtResourceOpen), not_pnacl_filter },
+    sizeof(kIrtResourceOpen),
+#if defined(OS_NACL_SFI)
+    not_pnacl_filter,
+#else
+    NULL,

[Mark Seaborn, 2014/10/28 21:57:23]

Maybe add a comment:  "If we change PNaCl to use Non-SFI Mode on the open web,
we should add a filter here."

[hidehiko, 2014/10/29 06:00:14]

Done.

+#endif
+  },
 };
 
 size_t chrome_irt_query(const char* interface_ident,
                         void* table, size_t tablesize) {
   size_t result = nacl_irt_query_list(interface_ident,
                                       table,
                                       tablesize,
                                       irt_interfaces,
                                       sizeof(irt_interfaces));
   if (result != 0)
     return result;
   return nacl_irt_query_core(interface_ident, table, tablesize);
 }