Some small refactoring and renaming of sel_universel pepper emulation components.

src/trusted/sel_universal/pepper_emu_handler.cc

 /*
  * Copyright (c) 2011 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.
  */
 
 // This file exports a single function used to setup the
 // multimedia sub-system for use with sel_universal
 // It was inpspired by src/trusted/plugin/srpc/multimedia_socket.cc
 // On the untrusted side it interface with: src/untrusted/av/nacl_av.c
@@ skipping 23 matching lines @@
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_image_data.h"
 
 #include "native_client/src/shared/imc/nacl_imc.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 
 #include "native_client/src/trusted/sel_universal/rpc_universal.h"
-#include "native_client/src/trusted/sel_universal/multimedia.h"
+#include "native_client/src/trusted/sel_universal/primitives.h"
 #include "native_client/src/trusted/sel_universal/parsing.h"
 #include "native_client/src/trusted/sel_universal/pepper_emu.h"
 #include "native_client/src/trusted/sel_universal/srpc_helper.h"
 
 using nacl::DescWrapperFactory;
 using nacl::DescWrapper;
 
 // ======================================================================
 const int kInvalidInstance = 0;
 const int kInvalidHandle = 0;
@@ skipping 397 matching lines @@
   CHECK(handle == Global.handle_audio_config);
 
   outs[0]->u.ival = Global.sample_frame_count;
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 
 // TODO(robertm): rename this to HandlerPepperEmuInitialize
 #define TUPLE(a, b) #a #b, a
-bool HandlerSDLInitialize(NaClCommandLoop* ncl, const vector<string>& args) {
+bool HandlerPepperEmuInitialize(NaClCommandLoop* ncl,
+                                const vector<string>& args) {
   NaClLog(LOG_INFO, "HandlerSDLInitialize\n");
   if (args.size() < 5) {
     NaClLog(LOG_ERROR, "Insufficient arguments to 'rpc' command.\n");
     return false;
   }
 
   UNREFERENCED_PARAMETER(ncl);
   // TODO(robertm): factor the audio video rpcs into a different file
   // and initialize them via say PepperEmuInitAV()
   ncl->AddUpcallRpc(TUPLE(PPB_Audio_Create, :ii:i));
@@ skipping 95 matching lines @@
 #endif
     return true;
   }
 }
 
 // uncomment the line below if you want to use a non-blocking
 // event processing loop.
 // This can be sometime useful for debugging but is wasting cycles
 // #define USE_POLLING
 
-bool HandlerSDLEventLoop(NaClCommandLoop* ncl, const vector<string>& args) {
+bool HandlerPepperEmuEventLoop(NaClCommandLoop* ncl,
+                               const vector<string>& args) {

[Sang Ahn, 2011/06/09 20:34:48]

Emu is short for Emulator? 

[robertm, 2011/06/09 21:02:21]

yes
On 2011/06/09 20:34:48, Sang Ahn wrote:

   NaClLog(LOG_INFO, "HandlerSDLEventLoop\n");
   UNREFERENCED_PARAMETER(args);
   UNREFERENCED_PARAMETER(ncl);
   PP_InputEvent event;
   while (true) {
     NaClLog(1, "event wait\n");
     if (!GetNextEvent(&event)) {
       continue;
     }
 
@@ skipping 94 matching lines @@
 
 void ReplayPPAPIEvents(std::string filename) {
   NaClLog(LOG_INFO, "replaying events from %s\n", filename.c_str());
   MakeInvalidEvent(&Global.next_sync_event);
   Global.event_replay_stream.open(filename.c_str(),
                                   std::ios::in | std::ios::binary);
   if (!Global.event_replay_stream.is_open()) {
     NaClLog(LOG_FATAL, "Cannot open %s\n", filename.c_str());
   }
 }