Track correctly the number of secure command channel connections

src/trusted/sel_universal/sel_universal.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // Second generation sel_universal implemented in C++
 
 #include <stdio.h>
 
@@ skipping 164 matching lines @@
   }
 
   if (app_name == "") {
     NaClLog(LOG_FATAL, "missing app\n");
   }
 
   return app_name;
 }
 
 
+static bool HandlerHardShutdown(NaClCommandLoop* ncl,
+                               const vector<string>& args) {
+  UNREFERENCED_PARAMETER(ncl);
+  UNREFERENCED_PARAMETER(args);
+  NaClSrpcInvokeBySignature(&command_channel, "hard_shutdown::");
+  return true;
+}
+
+
+static bool HandlerForceShutdown(NaClCommandLoop* ncl,
+                                const vector<string>& args) {
+  UNREFERENCED_PARAMETER(ncl);
+  UNREFERENCED_PARAMETER(args);
+  NaClSrpcDtor(&command_channel);
+  return true;
+}
+
+
 int raii_main(int argc, char* argv[]) {
   // Get the arguments to sed_ldr and the nexe module
   vector<nacl::string> sel_ldr_argv;
   vector<nacl::string> app_argv;
   nacl::string irt_name;
   nacl::string app_name =
     ProcessArguments(argc, argv, &irt_name, &sel_ldr_argv, &app_argv);
 
   if (silence_nexe) {
     // redirect stdout/stderr in the nexe to /dev/null
@@ skipping 98 matching lines @@
   loop.AddHandler("sync_socket_write", HandlerSyncSocketWrite);
   // new names
   loop.AddHandler("pnacl_emu_initialize", HandlerPnaclEmuInitialize);
   loop.AddHandler("pnacl_emu_add_varname_mapping",
                   HandlerPnaclEmuAddVarnameMapping);
   loop.AddHandler("reverse_service_add_manifest_mapping",
                   HandlerReverseEmuAddManifestMapping);
   loop.AddHandler("reverse_service_dump_manifest_mappings",
                   HandlerReverseEmuDumpManifestMappings);
   loop.AddHandler("stream_file", HandlerPnaclFileStream);
+  loop.AddHandler("wait_for_exit", HandlerWaitForExit);
+
+  loop.AddHandler("hard_shutdown", HandlerHardShutdown);
+  loop.AddHandler("force_shutdown", HandlerForceShutdown);
 
   NaClLog(1, "populating initial vars\n");
   for (map<string, string>::iterator it = initial_vars.begin();
        it != initial_vars.end();
        ++it) {
     loop.SetVariable(it->first, it->second);
   }
 
   const bool success = initial_commands.size() > 0 ?
                        loop.ProcessCommands(initial_commands) :
@@ skipping 15 matching lines @@
   NaClSrpcModuleInit();
   NaClNrdAllModulesInit();
 
   int exit_status = raii_main(argc, argv);
 
   NaClSrpcModuleFini();
   NaClNrdAllModulesFini();
 
   return exit_status;
 }