Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debugging intensif (sur V6) 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1727 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 1997-10-16 16:12:40 +00:00
parent 25b9a8f774
commit 6a3bbfa2b5
5 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
otherlibs/systhreads/Makefile.nt
View File

@ -48,7 +48,7 @@ clean: partialclean
install:
cp libthreads.lib $(LIBDIR)/libthreads.lib
if not exist $(LIBDIR)\threads mkdir $(LIBDIR)\threads
cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma $(LIBDIR)/threads
cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma $(LIBDIR)/threads
installopt:

1
otherlibs/systhreads/thread.mlp
View File

@ -23,7 +23,6 @@ external self : unit -> t = "caml_thread_self"
external id : t -> int = "caml_thread_id"
external exit : unit -> unit = "caml_thread_exit"
external join : t -> unit = "caml_thread_join"
external detach : t -> unit = "caml_thread_detach"
external kill : t -> unit = "caml_thread_kill"
(* For new, make sure the function passed to thread_new never

5
otherlibs/systhreads/threadUnix.ml
View File

@ -21,9 +21,8 @@ external execv : string -> string array -> unit = "unix_execv"
external execve : string -> string array -> string array -> unit
= "unix_execve"
external execvp : string -> string array -> unit = "unix_execvp"
external wait : unit -> int * process_status = "unix_wait"
external waitpid : wait_flag list -> int -> int * process_status
= "unix_waitpid"
let wait = Unix.wait
let waitpid = Unix.waitpid
let system = Unix.system
let read = Unix.read
let write = Unix.write

5
otherlibs/systhreads/threadUnix.mli
View File

@ -25,9 +25,8 @@ external execv : string -> string array -> unit = "unix_execv"
external execve : string -> string array -> string array -> unit
= "unix_execve"
external execvp : string -> string array -> unit = "unix_execvp"
external wait : unit -> int * Unix.process_status = "unix_wait"
external waitpid : Unix.wait_flag list -> int -> int * Unix.process_status
= "unix_waitpid"
val wait : unit -> int * Unix.process_status
val waitpid : Unix.wait_flag list -> int -> int * Unix.process_status
val system : string -> Unix.process_status
(*** Basic input/output *)

32
otherlibs/systhreads/win32.c
View File

@ -112,17 +112,21 @@ static void caml_thread_scan_roots(scanning_action action)
{
caml_thread_t th;
/* Scan the stacks, except that of the current thread (already done). */
for (th = curr_thread->next; th != curr_thread; th = th->next) {
th = curr_thread;
do {
(*action)(th->descr, &th->descr);
/* Don't rescan the stack of the current thread, it was done already */
if (th != curr_thread) {
#ifdef NATIVE_CODE
if (th->bottom_of_stack == NULL) continue;
do_local_roots(action, th->last_return_address,
th->bottom_of_stack, th->local_roots);
if (th->bottom_of_stack == NULL) continue;
do_local_roots(action, th->last_return_address,
th->bottom_of_stack, th->local_roots);
#else
do_local_roots(action, th->sp, th->stack_high, th->local_roots);
do_local_roots(action, th->sp, th->stack_high, th->local_roots);
#endif
}
}
th = th->next;
} while (th != curr_thread);
/* Hook */
if (prev_scan_roots_hook != NULL) (*prev_scan_roots_hook)(action);
}
@ -263,10 +267,11 @@ value caml_thread_initialize(value unit) /* ML */
caml_mutex = CreateMutex(NULL, TRUE, NULL);
if (caml_mutex == NULL) caml_wthread_error("Thread.init");
/* Create a finalized value to hold thread handle */
vthread = alloc_final(2, caml_thread_finalize, 1, 1000);
vthread = alloc_final(sizeof(struct caml_thread_handle) / sizeof(value),
caml_thread_finalize, 1, 1000);
((struct caml_thread_handle *)vthread)->handle = NULL;
/* Create a descriptor for the current thread */
descr = alloc_tuple(3);
descr = alloc_tuple(sizeof(struct caml_thread_descr) / sizeof(value));
Ident(descr) = Val_long(thread_next_ident);
Start_closure(descr) = Val_unit;
Threadhandle(descr) = (struct caml_thread_handle *) vthread;
@ -323,7 +328,7 @@ static void caml_thread_start(caml_thread_t th)
/* Cleanup: free the thread resources */
caml_thread_cleanup(th);
/* Release the main mutex */
ReleaseMutex(caml_mutex);
enter_blocking_section();
}
value caml_thread_new(value clos) /* ML */
@ -335,10 +340,11 @@ value caml_thread_new(value clos) /* ML */
Begin_roots2 (clos, vthread)
/* Create a finalized value to hold thread handle */
vthread = alloc_final(2, caml_thread_finalize, 1, 1000);
vthread = alloc_final(sizeof(struct caml_thread_handle) / sizeof(value),
caml_thread_finalize, 1, 1000);
((struct caml_thread_handle *)vthread)->handle = NULL;
/* Create a descriptor for the new thread */
descr = alloc_tuple(3);
descr = alloc_tuple(sizeof(struct caml_thread_descr) / sizeof(value));
Ident(descr) = Val_long(thread_next_ident);
Start_closure(descr) = clos;
Threadhandle(descr) = (struct caml_thread_handle *) vthread;
@ -415,7 +421,7 @@ value caml_thread_join(value th) /* ML */
value caml_thread_exit(value unit) /* ML */
{
caml_thread_cleanup(curr_thread);
ReleaseMutex(caml_mutex);
enter_blocking_section();
ExitThread(0);
return Val_unit; /* never reached */
}