1.1 --- a/PR__PI.h	Sun Sep 15 11:29:54 2013 -0700
     1.2 +++ b/PR__PI.h	Thu Sep 26 07:24:31 2013 -0700
     1.3 @@ -119,82 +119,6 @@
     1.4  #define \
     1.5  PR_PI__throw_exception   PR_int__throw_exception
     1.6  
     1.7 -//===============  Startup and Shutdown  ================
     1.8 -//===
     1.9 -//=
    1.10 -void
    1.11 -PR_SS__create_topEnv();
    1.12 -
    1.13 -AnimSlot **
    1.14 -PR_SS__create_anim_slots( int32 coreSlotsAreOn );
    1.15 -
    1.16 -void
    1.17 -PR_SS__create_the_coreCtlr_OS_threads();
    1.18 -
    1.19 -int
    1.20 -PR_SS__give_num_cores();
    1.21 -
    1.22 -//===================
    1.23 -void *
    1.24 -PR_SS__create_lang_env( int32 size, SlaveVP *slave, int32 magicNum );
    1.25 -
    1.26 -void
    1.27 -PR_SS__register_assigner( SlaveAssigner assigner, SlaveVP *seedVP, int32 magicNum );
    1.28 -void
    1.29 -PR_SS__register_lang_shutdown_handler( LangShutdownHdlr shutdownHdlr, SlaveVP *seedVP,
    1.30 -                                  int32 magicNum );
    1.31 -void
    1.32 -PR_SS__register_lang_data_creator( LangDataCreator langDataCreator, 
    1.33 -                                              SlaveVP *seedVP, int32 magicNum );
    1.34 -void
    1.35 -PR_SS__register_lang_meta_task_creator( LangDataCreator langMetaTaskCreator, 
    1.36 -                                              SlaveVP *seedVP, int32 magicNum );
    1.37 -void
    1.38 -PR_SS__register_make_slave_ready_fn( MakeSlaveReadyFn fn, SlaveVP *seedVP,
    1.39 -                                                               int32 magicNum );
    1.40 -void
    1.41 -PR_SS__register_make_task_ready_fn( MakeTaskReadyFn fn, SlaveVP *seedVP,
    1.42 -                                                               int32 magicNum );
    1.43 -//===================
    1.44 -
    1.45 -void
    1.46 -PR_SS__end_process_normally( PRProcess *process );
    1.47 -
    1.48 -void
    1.49 -PR_SS__shutdown_OS_threads();
    1.50 -
    1.51 -SlaveVP* 
    1.52 -PR_SS__create_shutdown_slave();
    1.53 -
    1.54 -void
    1.55 -PR_SS__cleanup_at_end_of_shutdown();
    1.56 - 
    1.57 -void
    1.58 -PR_SS__print_out_measurements();
    1.59 -
    1.60 -void
    1.61 -PR_SS__wait_for_PR_to_shutdown();
    1.62 -
    1.63 -
    1.64 -//=============================
    1.65 -//===
    1.66 -//=
    1.67 -
    1.68 -#define \
    1.69 -PR_SS__give_proto_lang_env_for_slave   PR_int__give_proto_lang_env_for_slave
    1.70 -
    1.71 -#define \
    1.72 -PR_SS__give_lang_meta_task_from_slave   PR_int__give_lang_meta_task_from_slave
    1.73 -#define \
    1.74 -PR_SS__give_lang_env_for_slave   PR_int__give_lang_env_for_slave
    1.75 -#define \
    1.76 -PR_SS__give_lang_env_from_process   PR_int__give_lang_env_from_process
    1.77 -
    1.78 -#define \
    1.79 -PR_SS__malloc  PR_WL__malloc /*SS happens outside the Master*/
    1.80 -#define \
    1.81 -PR_SS__free    PR_WL__free
    1.82 -
    1.83  //================================================
    1.84  #endif	/* _PR__PI_H */
    1.85  

     2.1 --- a/PR__SS.h	Sun Sep 15 11:29:54 2013 -0700
     2.2 +++ b/PR__SS.h	Thu Sep 26 07:24:31 2013 -0700
     2.3 @@ -74,11 +74,15 @@
     2.4  void
     2.5  PR_SS__create_topEnv();
     2.6  
     2.7 -AnimSlot **
     2.8 -PR_SS__create_anim_slots( int32 coreSlotsAreOn );
     2.9 +AnimSlot *
    2.10 +PR_SS__create_anim_slot( int32 coreSlotsAreOn );
    2.11  
    2.12  void
    2.13  PR_SS__create_the_coreCtlr_OS_threads();
    2.14 +
    2.15 +int
    2.16 +PR_SS__give_num_cores();
    2.17 +
    2.18  //===================
    2.19  
    2.20  void
    2.21 @@ -114,6 +118,11 @@
    2.22  #define \
    2.23  PR_SS__give_lang_env_from_process   PR_int__give_lang_env_from_process
    2.24  
    2.25 +#define \
    2.26 +PR_SS__malloc  PR_WL__malloc /*SS happens outside the Master*/
    2.27 +#define \
    2.28 +PR_SS__free    PR_WL__free
    2.29 +
    2.30  //================================================
    2.31  #endif	/*  */
    2.32