mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-03 17:54:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

beos: Fix replicants

Browse Source 
Waiting on the semaphore was not enough, it was causing a crash on
replicant removal. Now we wait for the replicant main thread to exit.
It fixes replicants, at least when a single one is used per application.
Using more than one still causes issues due to some libs not liking
being used twice (hlcache it seems).
This commit is contained in:
François Revol 2013-03-22 00:25:27 +01:00
parent 15cb6886f2
commit 48dc679d7b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
beos/scaffolding.cpp
View File

@ -142,6 +142,7 @@ struct replicant_thread_info {
static int open_windows = 0; /**< current number of open browsers */ static int open_windows = 0; /**< current number of open browsers */
static NSBaseView *replicant_view = NULL; /**< if not NULL, the replicant View we are running NetSurf for */ static NSBaseView *replicant_view = NULL; /**< if not NULL, the replicant View we are running NetSurf for */
static sem_id replicant_done_sem = -1; static sem_id replicant_done_sem = -1;
static thread_id replicant_thread = -1;
static void nsbeos_window_update_back_forward(struct beos_scaffolding *); static void nsbeos_window_update_back_forward(struct beos_scaffolding *);
static void nsbeos_throb(void *); static void nsbeos_throb(void *);
@ -224,9 +225,14 @@ NSBaseView::NSBaseView(BMessage *archive)
NSBaseView::~NSBaseView() NSBaseView::~NSBaseView()
{ {
//warn_user ("~NSBaseView()", NULL); //warn_user ("~NSBaseView()", NULL);
BMessage *message = new BMessage(B_QUIT_REQUESTED); if (replicated) {
nsbeos_pipe_message_top(message, NULL, fScaffolding); BMessage *message = new BMessage(B_QUIT_REQUESTED);
while (acquire_sem(replicant_done_sem) == EINTR); nsbeos_pipe_message_top(message, NULL, fScaffolding);
while (acquire_sem(replicant_done_sem) == EINTR);
//debugger("plop");
status_t status = -1;
wait_for_thread(replicant_thread, &status);
}
} }
@ -397,15 +403,15 @@ NSBaseView::Instantiate(BMessage *archive)
gui_init_replicant(2, info->args); gui_init_replicant(2, info->args);
replicant_done_sem = create_sem(0, "NS Replicant created"); replicant_done_sem = create_sem(0, "NS Replicant created");
thread_id nsMainThread = spawn_thread(nsbeos_replicant_main_thread, replicant_thread = spawn_thread(nsbeos_replicant_main_thread,
"NetSurf Main Thread", B_NORMAL_PRIORITY, info); "NetSurf Main Thread", B_NORMAL_PRIORITY, info);
if (nsMainThread < B_OK) { if (replicant_thread < B_OK) {
delete_sem(replicant_done_sem); delete_sem(replicant_done_sem);
delete info; delete info;
delete view; delete view;
return NULL; return NULL;
} }
resume_thread(nsMainThread); resume_thread(replicant_thread);
//XXX: deadlocks BeHappy //XXX: deadlocks BeHappy
//while (acquire_sem(replicant_done_sem) == EINTR); //while (acquire_sem(replicant_done_sem) == EINTR);