Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit cdcbfda8 authored by deuce's avatar deuce

Set more thread names.

parent 056e5814
...@@ -1357,6 +1357,7 @@ unsigned int sdl_get_char_code(unsigned int keysym, unsigned int mod, unsigned i ...@@ -1357,6 +1357,7 @@ unsigned int sdl_get_char_code(unsigned int keysym, unsigned int mod, unsigned i
/* Mouse event/keyboard thread */ /* Mouse event/keyboard thread */
int sdl_mouse_thread(void *data) int sdl_mouse_thread(void *data)
{ {
SetThreadName("SDL Mouse");
while(1) { while(1) {
if(mouse_wait()) if(mouse_wait())
sdl_add_key(CIO_KEY_MOUSE); sdl_add_key(CIO_KEY_MOUSE);
......
...@@ -45,3 +45,6 @@ make USE_SDL_AUDIO=1 STATIC_SDL=1 RELEASE=1 PREFIX=/usr ...@@ -45,3 +45,6 @@ make USE_SDL_AUDIO=1 STATIC_SDL=1 RELEASE=1 PREFIX=/usr
The package is generated and copied do a disk image which is then converted The package is generated and copied do a disk image which is then converted
with the following command: with the following command:
hdiutil convert ~/Desktop/SyncTERM.dmg -format UDRO -o /Volumes/Synchronet/sbbs/web/root/syncterm.bbsdev.net/SyncTERM.dmg hdiutil convert ~/Desktop/SyncTERM.dmg -format UDRO -o /Volumes/Synchronet/sbbs/web/root/syncterm.bbsdev.net/SyncTERM.dmg
Release builds for Win32 using MinGW32 use the following command line:
gmake DONT_CLOBBER_CC=yes CC=mingw32-gcc VERBOSE=please AR=mingw32-ar RANLIB=mingw32-ranlib RELEASE=1 CXX=mingw32-g++ WINDRES=mingw32-windres
...@@ -289,8 +289,9 @@ void pty_input_thread(void *args) ...@@ -289,8 +289,9 @@ void pty_input_thread(void *args)
int rd; int rd;
int buffered; int buffered;
size_t buffer; size_t buffer;
int i; int i;
SetThreadName("PTY Input");
conn_api.input_thread_running=1; conn_api.input_thread_running=1;
while(master != -1 && !conn_api.terminate) { while(master != -1 && !conn_api.terminate) {
if((i=waitpid(child_pid, &status, WNOHANG))) if((i=waitpid(child_pid, &status, WNOHANG)))
...@@ -338,6 +339,7 @@ void pty_output_thread(void *args) ...@@ -338,6 +339,7 @@ void pty_output_thread(void *args)
int ret; int ret;
int sent; int sent;
SetThreadName("PTY Output");
conn_api.output_thread_running=1; conn_api.output_thread_running=1;
while(master != -1 && !conn_api.terminate) { while(master != -1 && !conn_api.terminate) {
if(waitpid(child_pid, &status, WNOHANG)) if(waitpid(child_pid, &status, WNOHANG))
......
...@@ -30,6 +30,7 @@ void telnet_input_thread(void *args) ...@@ -30,6 +30,7 @@ void telnet_input_thread(void *args)
char rbuf[BUFFER_SIZE]; char rbuf[BUFFER_SIZE];
char *buf; char *buf;
SetThreadName("Telnet Input");
conn_api.input_thread_running=1; conn_api.input_thread_running=1;
while(telnet_sock != INVALID_SOCKET && !conn_api.terminate) { while(telnet_sock != INVALID_SOCKET && !conn_api.terminate) {
FD_ZERO(&rds); FD_ZERO(&rds);
...@@ -79,6 +80,7 @@ void telnet_output_thread(void *args) ...@@ -79,6 +80,7 @@ void telnet_output_thread(void *args)
char ebuf[BUFFER_SIZE*2]; char ebuf[BUFFER_SIZE*2];
char *buf; char *buf;
SetThreadName("Telnet Output");
conn_api.output_thread_running=1; conn_api.output_thread_running=1;
while(telnet_sock != INVALID_SOCKET && !conn_api.terminate) { while(telnet_sock != INVALID_SOCKET && !conn_api.terminate) {
pthread_mutex_lock(&(conn_outbuf.mutex)); pthread_mutex_lock(&(conn_outbuf.mutex));
......
...@@ -283,6 +283,7 @@ void html_thread(void *args) ...@@ -283,6 +283,7 @@ void html_thread(void *args)
int argc=1; int argc=1;
char *argv[2]; char *argv[2];
SetThreadName("HTML Thread");
html_thread_running=true; html_thread_running=true;
argv[0]=(char *)"wxHTML"; argv[0]=(char *)"wxHTML";
argv[1]=(char *)"--sync"; argv[1]=(char *)"--sync";
......
...@@ -24,6 +24,7 @@ void modem_input_thread(void *args) ...@@ -24,6 +24,7 @@ void modem_input_thread(void *args)
size_t buffer; size_t buffer;
BOOL monitor_dsr=TRUE; BOOL monitor_dsr=TRUE;
SetThreadName("Modem Input");
conn_api.input_thread_running=1; conn_api.input_thread_running=1;
if(args != NULL) { if(args != NULL) {
if((comGetModemStatus(com)&COM_DSR) == 0) if((comGetModemStatus(com)&COM_DSR) == 0)
...@@ -59,6 +60,7 @@ void modem_output_thread(void *args) ...@@ -59,6 +60,7 @@ void modem_output_thread(void *args)
int sent; int sent;
BOOL monitor_dsr=TRUE; BOOL monitor_dsr=TRUE;
SetThreadName("Modem Output");
conn_api.output_thread_running=1; conn_api.output_thread_running=1;
if(args != NULL) { if(args != NULL) {
if((comGetModemStatus(com)&COM_DSR) == 0) if((comGetModemStatus(com)&COM_DSR) == 0)
......
...@@ -22,6 +22,7 @@ void rlogin_input_thread(void *args) ...@@ -22,6 +22,7 @@ void rlogin_input_thread(void *args)
int buffered; int buffered;
size_t buffer; size_t buffer;
SetThreadName("RLogin Input");
conn_api.input_thread_running=1; conn_api.input_thread_running=1;
while(sock != INVALID_SOCKET && !conn_api.terminate) { while(sock != INVALID_SOCKET && !conn_api.terminate) {
FD_ZERO(&rds); FD_ZERO(&rds);
...@@ -67,6 +68,7 @@ void rlogin_output_thread(void *args) ...@@ -67,6 +68,7 @@ void rlogin_output_thread(void *args)
int ret; int ret;
int sent; int sent;
SetThreadName("RLogin Output");
conn_api.output_thread_running=1; conn_api.output_thread_running=1;
while(sock != INVALID_SOCKET && !conn_api.terminate) { while(sock != INVALID_SOCKET && !conn_api.terminate) {
pthread_mutex_lock(&(conn_outbuf.mutex)); pthread_mutex_lock(&(conn_outbuf.mutex));
......
...@@ -50,6 +50,7 @@ void ssh_input_thread(void *args) ...@@ -50,6 +50,7 @@ void ssh_input_thread(void *args)
size_t buffer; size_t buffer;
struct timeval tv; struct timeval tv;
SetThreadName("SSH Input");
conn_api.input_thread_running=1; conn_api.input_thread_running=1;
while(ssh_active && !conn_api.terminate) { while(ssh_active && !conn_api.terminate) {
FD_ZERO(&rds); FD_ZERO(&rds);
...@@ -98,6 +99,7 @@ void ssh_output_thread(void *args) ...@@ -98,6 +99,7 @@ void ssh_output_thread(void *args)
size_t sent; size_t sent;
int status; int status;
SetThreadName("SSH Output");
conn_api.output_thread_running=1; conn_api.output_thread_running=1;
while(ssh_active && !conn_api.terminate) { while(ssh_active && !conn_api.terminate) {
pthread_mutex_lock(&(conn_outbuf.mutex)); pthread_mutex_lock(&(conn_outbuf.mutex));
......
...@@ -1269,6 +1269,7 @@ int main(int argc, char **argv) ...@@ -1269,6 +1269,7 @@ int main(int argc, char **argv)
"syncterm-60-w|SyncTERM 132x60 No Status Line,\n" "syncterm-60-w|SyncTERM 132x60 No Status Line,\n"
" cols#132,lines#60,use=syncterm,\n"; " cols#132,lines#60,use=syncterm,\n";
SetThreadName("Main Thread");
if(argc==2 && strcmp(argv[1],"-T")==0) { if(argc==2 && strcmp(argv[1],"-T")==0) {
write(STDOUT_FILENO, syncterm_termcap, strlen(syncterm_termcap)); write(STDOUT_FILENO, syncterm_termcap, strlen(syncterm_termcap));
return 0; return 0;
......
...@@ -859,6 +859,7 @@ void guts_background_download(void *cbdata) ...@@ -859,6 +859,7 @@ void guts_background_download(void *cbdata)
zmodem_t zm; zmodem_t zm;
ulong bytes_received; ulong bytes_received;
SetThreadName("GUTS Download");
zmodem_mode=ZMODEM_MODE_RECV; zmodem_mode=ZMODEM_MODE_RECV;
transfer_buf_len=0; transfer_buf_len=0;
...@@ -885,6 +886,7 @@ void guts_background_upload(void *cbdata) ...@@ -885,6 +886,7 @@ void guts_background_upload(void *cbdata)
ulong fsize; ulong fsize;
FILE* fp; FILE* fp;
SetThreadName("GUTS Upload");
if((fp=fopen(gi.files[0],"rb"))==NULL) { if((fp=fopen(gi.files[0],"rb"))==NULL) {
fprintf(stderr,"Error %d opening %s for read",errno,gi.files[0]); fprintf(stderr,"Error %d opening %s for read",errno,gi.files[0]);
return; return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment