suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Places] added place-kill

Browse Source
This commit is contained in:
Kevin Tew 2011-03-18 14:34:42 -06:00
parent b8c779b059
commit ae8b326522
6 changed files with 101 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
collects/racket/place.rkt
View File

@ -13,6 +13,7 @@
(provide place
place-sleep
place-wait
place-kill
place-channel
place-channel-send
place-channel-recv
@ -55,6 +56,7 @@
(define (th-place-sleep n) (sleep n))
(define (th-place-wait pl) (thread-wait (TH-place-th pl)) 0)
(define (th-place-kill pl) (kill-thread (TH-place-th pl)))
(define (th-place-channel)
(define-values (as ar) (make-th-async-channel))
(define-values (bs br) (make-th-async-channel))
@ -112,6 +114,7 @@
(define-pl place pl-place th-place)
(define-pl place-sleep pl-place-sleep th-place-sleep)
(define-pl place-wait pl-place-wait th-place-wait)
(define-pl place-kill pl-place-kill th-place-kill)
(define-pl place-channel pl-place-channel th-place-channel)
(define-pl place-channel-send pl-place-channel-send th-place-channel-send)
(define-pl place-channel-recv pl-place-channel-recv th-place-channel-recv)

5
collects/tests/racket/place.rktl
View File

@ -30,4 +30,7 @@
(err/rt-test (place null 10))
(err/rt-test (place "foo.rkt" 10))
(let ([p (place/base (p1 ch)
(printf "Hello form place 2\n")
(sync never-evt))])
(place-kill p))

2
src/racket/include/schthread.h
View File

@ -309,6 +309,7 @@ typedef struct Thread_Local_Variables {
struct Scheme_Hash_Table *place_local_misc_table_;
int place_evts_array_size_;
struct Evt **place_evts_;
void *place_object_;
} Thread_Local_Variables;
#if defined(IMPLEMENT_THREAD_LOCAL_VIA_PTHREADS)
@ -623,6 +624,7 @@ XFORM_GC_VARIABLE_STACK_THROUGH_THREAD_LOCAL;
#define place_local_misc_table XOA (scheme_get_thread_local_variables()->place_local_misc_table_)
#define place_evts_array_size XOA (scheme_get_thread_local_variables()->place_evts_array_size_)
#define place_evts XOA (scheme_get_thread_local_variables()->place_evts_)
#define place_object XOA (scheme_get_thread_local_variables()->place_object_)
/* **************************************** */

80
src/racket/src/places.c
View File

@ -15,8 +15,10 @@ SHARED_OK static int scheme_places_enabled = 1;
SHARED_OK mz_proc_thread *scheme_master_proc_thread;
THREAD_LOCAL_DECL(mz_proc_thread *proc_thread_self);
THREAD_LOCAL_DECL(void *place_object);
static Scheme_Object *scheme_place(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_wait(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_kill(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_sleep(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_p(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_send(int argc, Scheme_Object *args[]);
@ -24,6 +26,7 @@ static Scheme_Object *scheme_place_recv(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_channel_p(int argc, Scheme_Object *args[]);
static Scheme_Object *def_place_exit_handler_proc(int argc, Scheme_Object *args[]);
static Scheme_Object *scheme_place_channel(int argc, Scheme_Object *args[]);
static int cust_kill_place(Scheme_Object *pl, void *notused);
static Scheme_Place_Async_Channel *scheme_place_async_channel_create();
static Scheme_Place_Bi_Channel *scheme_place_bi_channel_create();
@ -83,6 +86,7 @@ void scheme_init_place(Scheme_Env *env)
PLACE_PRIM_W_ARITY("place", scheme_place, 2, 2, plenv);
PLACE_PRIM_W_ARITY("place-sleep", scheme_place_sleep, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place-wait", scheme_place_wait, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place-kill", scheme_place_kill, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place?", scheme_place_p, 1, 1, plenv);
PLACE_PRIM_W_ARITY("place-channel", scheme_place_channel, 0, 0, plenv);
PLACE_PRIM_W_ARITY("place-channel-send", scheme_place_send, 1, 2, plenv);
@ -128,6 +132,7 @@ typedef struct Place_Start_Data {
Scheme_Object *channel;
Scheme_Object *current_library_collection_paths;
mzrt_sema *ready;
void *place_obj;
} Place_Start_Data;
static Scheme_Object *def_place_exit_handler_proc(int argc, Scheme_Object *argv[])
@ -161,22 +166,37 @@ Scheme_Object *scheme_place_sleep(int argc, Scheme_Object *args[]) {
return scheme_void;
}
/* this struct is NOT a Scheme_Object
* it is shared acrosss place boundaries and
* must be allocated with malloc and free*/
typedef struct Scheme_Place_Object {
int die;
mz_jmp_buf *exit_buf;
void *signal_handle;
/*Thread_Local_Variables *tlvs; */
} Scheme_Place_Object;
Scheme_Object *scheme_place(int argc, Scheme_Object *args[]) {
Scheme_Place *place;
Place_Start_Data *place_data;
mz_proc_thread *proc_thread;
Scheme_Object *collection_paths;
Scheme_Place_Object *place_obj;
mzrt_sema *ready;
/* create place object */
place = MALLOC_ONE_TAGGED(Scheme_Place);
place->so.type = scheme_place_type;
place_obj = malloc(sizeof(Scheme_Place_Object));
place->place_obj = place_obj;
place_obj->die = 0;
mzrt_sema_create(&ready, 0);
/* pass critical info to new place */
place_data = MALLOC_ONE(Place_Start_Data);
place_data->ready = ready;
place_data->place_obj = place_obj;
if (argc == 2) {
Scheme_Object *so;
@ -222,9 +242,48 @@ Scheme_Object *scheme_place(int argc, Scheme_Object *args[]) {
place->proc_thread = proc_thread;
{
Scheme_Custodian *cust;
Scheme_Custodian_Reference *mref;
cust = scheme_get_current_custodian();
mref = scheme_add_managed(NULL,
(Scheme_Object *)place,
(Scheme_Close_Custodian_Client *)cust_kill_place,
NULL,
1);
place->mref = mref;
}
return (Scheme_Object*) place;
}
static int place_kill(Scheme_Place *place) {
Scheme_Place_Object *place_obj;
place_obj = (Scheme_Place_Object*) place->place_obj;
place_obj->die = 1;
scheme_signal_received_at(place_obj->signal_handle);
scheme_remove_managed(place->mref, (Scheme_Object *)place);
return 0;
}
static int cust_kill_place(Scheme_Object *pl, void *notused) {
return place_kill((Scheme_Place *)pl);
}
static Scheme_Object *scheme_place_kill(int argc, Scheme_Object *args[]) {
Scheme_Place *place;
place = (Scheme_Place *) args[0];
if (argc != 1) {
scheme_wrong_count_m("place-kill", 1, 1, argc, args, 0);
}
if (!SAME_TYPE(SCHEME_TYPE(args[0]), scheme_place_type)) {
scheme_wrong_type("place-kill", "place", 0, argc, args);
}
return scheme_make_integer(place_kill(place));
}
# if defined(MZ_PLACES_WAITPID)
/*============= SIGCHLD SIGNAL HANDLING =============*/
@ -988,9 +1047,18 @@ static void *place_start_proc(void *data_arg) {
stack_base = NULL;
return rc;
}
void scheme_place_check_for_killed() {
Scheme_Place_Object *place_obj;
place_obj = (Scheme_Place_Object *) place_object;
if (place_obj && place_obj->die) {
scheme_longjmp(*place_obj->exit_buf, 1);
}
}
static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
Place_Start_Data *place_data;
Scheme_Place_Object *place_obj;
Scheme_Object *place_main;
Scheme_Object *a[2], *channel;
mzrt_thread_id ptid;
@ -1020,6 +1088,14 @@ static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
else {
channel = place_data->channel;
}
place_obj = (Scheme_Place_Object*) place_data->place_obj;
place_object = place_obj;
{
void *signal_handle;
signal_handle = scheme_get_signal_handle();
place_obj->signal_handle = signal_handle;
}
mzrt_sema_post(place_data->ready);
place_data = NULL;
@ -1040,6 +1116,8 @@ static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
mz_jmp_buf * volatile saved_error_buf;
mz_jmp_buf new_error_buf;
place_obj->exit_buf = &new_error_buf;
p = scheme_get_current_thread();
saved_error_buf = p->error_buf;
p->error_buf = &new_error_buf;
@ -1058,6 +1136,8 @@ static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
/*printf("Leavin place: proc thread id%u\n", ptid);*/
scheme_place_instance_destroy();
free(place_object);
place_object = NULL;
return (void*) rc;
}

3
src/racket/src/schpriv.h
View File

@ -534,6 +534,7 @@ typedef struct Scheme_Custodian_Box {
} Scheme_Custodian_Box;
Scheme_Thread *scheme_do_close_managed(Scheme_Custodian *m, Scheme_Exit_Closer_Func f);
Scheme_Custodian *scheme_get_current_custodian(void);
typedef struct Scheme_Security_Guard {
Scheme_Object so;
@ -3633,7 +3634,9 @@ typedef struct Scheme_Place_Bi_Channel {
typedef struct Scheme_Place {
Scheme_Object so;
void *proc_thread;
void *place_obj;
Scheme_Object *channel;
Scheme_Custodian_Reference *mref;
} Scheme_Place;
Scheme_Env *scheme_place_instance_init();

9
src/racket/src/thread.c
View File

@ -1551,6 +1551,11 @@ static Scheme_Object *current_custodian(int argc, Scheme_Object *argv[])
-1, custodian_p, "custodian", 0);
}
Scheme_Custodian *scheme_get_current_custodian()
{
return (Scheme_Custodian *) current_custodian(0, NULL);
}
static Scheme_Object *make_custodian_box(int argc, Scheme_Object *argv[])
{
Scheme_Custodian_Box *cb;
@ -4156,6 +4161,10 @@ void scheme_thread_block(float sleep_time)
if (!do_atomic)
GC_check_master_gc_request();
#endif
#if defined(MZ_USE_PLACES)
if (!do_atomic)
scheme_place_check_for_killed();
#endif
if (sleep_end > 0) {
if (sleep_end > scheme_get_inexact_milliseconds()) {