# HG changeset patch # User Sean Halle # Date 1380205471 25200 # Node ID 9d607381c7caa3da7fdf295ceccf25c09dc3377d # Parent f278511770cea9657272f4931022a9e3e99f600e Took SS out of PI and modified create slots diff -r f278511770ce -r 9d607381c7ca PR__PI.h --- a/PR__PI.h Sun Sep 15 11:29:54 2013 -0700 +++ b/PR__PI.h Thu Sep 26 07:24:31 2013 -0700 @@ -119,82 +119,6 @@ #define \ PR_PI__throw_exception PR_int__throw_exception -//=============== Startup and Shutdown ================ -//=== -//= -void -PR_SS__create_topEnv(); - -AnimSlot ** -PR_SS__create_anim_slots( int32 coreSlotsAreOn ); - -void -PR_SS__create_the_coreCtlr_OS_threads(); - -int -PR_SS__give_num_cores(); - -//=================== -void * -PR_SS__create_lang_env( int32 size, SlaveVP *slave, int32 magicNum ); - -void -PR_SS__register_assigner( SlaveAssigner assigner, SlaveVP *seedVP, int32 magicNum ); -void -PR_SS__register_lang_shutdown_handler( LangShutdownHdlr shutdownHdlr, SlaveVP *seedVP, - int32 magicNum ); -void -PR_SS__register_lang_data_creator( LangDataCreator langDataCreator, - SlaveVP *seedVP, int32 magicNum ); -void -PR_SS__register_lang_meta_task_creator( LangDataCreator langMetaTaskCreator, - SlaveVP *seedVP, int32 magicNum ); -void -PR_SS__register_make_slave_ready_fn( MakeSlaveReadyFn fn, SlaveVP *seedVP, - int32 magicNum ); -void -PR_SS__register_make_task_ready_fn( MakeTaskReadyFn fn, SlaveVP *seedVP, - int32 magicNum ); -//=================== - -void -PR_SS__end_process_normally( PRProcess *process ); - -void -PR_SS__shutdown_OS_threads(); - -SlaveVP* -PR_SS__create_shutdown_slave(); - -void -PR_SS__cleanup_at_end_of_shutdown(); - -void -PR_SS__print_out_measurements(); - -void -PR_SS__wait_for_PR_to_shutdown(); - - -//============================= -//=== -//= - -#define \ -PR_SS__give_proto_lang_env_for_slave PR_int__give_proto_lang_env_for_slave - -#define \ -PR_SS__give_lang_meta_task_from_slave PR_int__give_lang_meta_task_from_slave -#define \ -PR_SS__give_lang_env_for_slave PR_int__give_lang_env_for_slave -#define \ -PR_SS__give_lang_env_from_process PR_int__give_lang_env_from_process - -#define \ -PR_SS__malloc PR_WL__malloc /*SS happens outside the Master*/ -#define \ -PR_SS__free PR_WL__free - //================================================ #endif /* _PR__PI_H */ diff -r f278511770ce -r 9d607381c7ca PR__SS.h --- a/PR__SS.h Sun Sep 15 11:29:54 2013 -0700 +++ b/PR__SS.h Thu Sep 26 07:24:31 2013 -0700 @@ -74,11 +74,15 @@ void PR_SS__create_topEnv(); -AnimSlot ** -PR_SS__create_anim_slots( int32 coreSlotsAreOn ); +AnimSlot * +PR_SS__create_anim_slot( int32 coreSlotsAreOn ); void PR_SS__create_the_coreCtlr_OS_threads(); + +int +PR_SS__give_num_cores(); + //=================== void @@ -114,6 +118,11 @@ #define \ PR_SS__give_lang_env_from_process PR_int__give_lang_env_from_process +#define \ +PR_SS__malloc PR_WL__malloc /*SS happens outside the Master*/ +#define \ +PR_SS__free PR_WL__free + //================================================ #endif /* */