80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix libedit crashes

Browse Source 
Set priorty of main_thread to High
This commit is contained in:
Cacodemon345
2021-08-28 23:06:07 +06:00
parent e025a422df
commit 03497b5bbf
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/unix/unix.c
View File

@@ -464,6 +464,7 @@ main_thread(void *param)
uint32_t old_time, new_time; uint32_t old_time, new_time;
int drawits, frames; int drawits, frames;
SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
framecountx = 0; framecountx = 0;
//title_update = 1; //title_update = 1;
old_time = SDL_GetTicks(); old_time = SDL_GetTicks();
@@ -725,18 +726,6 @@ void monitor_thread(void* param)
{ {
char* line = NULL; char* line = NULL;
size_t n; size_t n;
void* libedithandle = dlopen(LIBEDIT_LIBRARY, RTLD_LOCAL | RTLD_LAZY);
if (libedithandle)
{
f_readline = dlsym(libedithandle, "readline");
f_add_history = dlsym(libedithandle, "add_history");
if (!f_readline)
{
fprintf(stderr, "readline in libedit not found, line editing will be limited.\n");
}
f_rl_callback_handler_remove = dlsym(libedithandle, "rl_callback_handler_remove");
}
else fprintf(stderr, "libedit not found, line editing will be limited.\n");
printf("86Box monitor console.\n"); printf("86Box monitor console.\n");
while (!exit_event) while (!exit_event)
{ {
@@ -834,25 +823,25 @@ void monitor_thread(void* param)
cdrom_mount(id, fn); cdrom_mount(id, fn);
} }
} }
else if (strncasecmp(xargv[0], "fddeject", 8) == 0 && cmdargc >= 3) else if (strncasecmp(xargv[0], "fddeject", 8) == 0 && cmdargc >= 2)
{ {
floppy_eject(atoi(xargv[2])); floppy_eject(atoi(xargv[1]));
} }
else if (strncasecmp(xargv[0], "cdeject", 8) == 0 && cmdargc >= 3) else if (strncasecmp(xargv[0], "cdeject", 8) == 0 && cmdargc >= 2)
{ {
cdrom_mount(atoi(xargv[2]), ""); cdrom_mount(atoi(xargv[1]), "");
} }
else if (strncasecmp(xargv[0], "moeject", 8) == 0 && cmdargc >= 3) else if (strncasecmp(xargv[0], "moeject", 8) == 0 && cmdargc >= 2)
{ {
mo_eject(atoi(xargv[2])); mo_eject(atoi(xargv[1]));
} }
else if (strncasecmp(xargv[0], "carteject", 8) == 0 && cmdargc >= 3) else if (strncasecmp(xargv[0], "carteject", 8) == 0 && cmdargc >= 2)
{ {
cartridge_eject(atoi(xargv[2])); cartridge_eject(atoi(xargv[1]));
} }
else if (strncasecmp(xargv[0], "zipeject", 8) == 0 && cmdargc >= 3) else if (strncasecmp(xargv[0], "zipeject", 8) == 0 && cmdargc >= 2)
{ {
zip_eject(atoi(xargv[2])); zip_eject(atoi(xargv[1]));
} }
else if (strncasecmp(xargv[0], "fddload", 7) == 0 && cmdargc >= 4) else if (strncasecmp(xargv[0], "fddload", 7) == 0 && cmdargc >= 4)
{ {
@@ -953,6 +942,7 @@ SDL_threadID eventthread;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
SDL_Event event; SDL_Event event;
void* libedithandle;
SDL_Init(0); SDL_Init(0);
pc_init(argc, argv); pc_init(argc, argv);
@@ -969,6 +959,18 @@ int main(int argc, char** argv)
fprintf(stderr, "Failed to create blit mutex: %s", SDL_GetError()); fprintf(stderr, "Failed to create blit mutex: %s", SDL_GetError());
return -1; return -1;
} }
libedithandle = dlopen(LIBEDIT_LIBRARY, RTLD_LOCAL | RTLD_LAZY);
if (libedithandle)
{
f_readline = dlsym(libedithandle, "readline");
f_add_history = dlsym(libedithandle, "add_history");
if (!f_readline)
{
fprintf(stderr, "readline in libedit not found, line editing will be limited.\n");
}
f_rl_callback_handler_remove = dlsym(libedithandle, "rl_callback_handler_remove");
}
else fprintf(stderr, "libedit not found, line editing will be limited.\n");
mousemutex = SDL_CreateMutex(); mousemutex = SDL_CreateMutex();
sdl_initho(); sdl_initho();