diff --git a/motif/server/callbacks.c b/motif/server/callbacks.c index d89443e2e19d4df1eebe4ff8e2331bbaa0c91456..bee26cf86e16222b8f766c7c9a16e018e1a3b09d 100644 --- a/motif/server/callbacks.c +++ b/motif/server/callbacks.c @@ -202,6 +202,7 @@ void write_text_callback(message_t reply,XmTextVerifyCallbackStruct *info) message_write_int(reply,info->text->format,int_tag); printf("modifying_text_value: %s ; length=%d\n",info->text->ptr, info->text->length); + fflush(stdout); } } diff --git a/motif/server/datatrans.c b/motif/server/datatrans.c index 796f431afbb14efaf8bb712f5556e23eae03b3d0..ee49251af138351b050ec9bcc75596c60ee895da 100644 --- a/motif/server/datatrans.c +++ b/motif/server/datatrans.c @@ -154,11 +154,13 @@ void message_write_int_list(message_t message,IntList *list,int tag) void message_write_widget_list(message_t message,MyWidgetList *list,int tag) { fprintf(stderr,">>>>> Warning:write_widget_list:We shouldn't be here!\n"); + fflush(stderr); } void message_write_resource_names(message_t message,ResourceList *list,int tag) { fprintf(stderr,">>>>> Warning:write_resource_names:We shouldn't be here!\n"); + fflush(stderr); } void message_write_xm_string(message_t message,XmString xs,int tag) @@ -384,6 +386,7 @@ void message_read_widget_list(message_t message,MyWidgetList *list, void message_read_int_list(message_t message,IntList *list,int tag,int length) { fprintf(stderr,">>>>> Warning:message_read_int_list: Shouldn't be here.\n"); + fflush(stderr); } void message_read_translation_table(message_t m,XtTranslations *t, @@ -436,6 +439,7 @@ void message_read_color(message_t m,XColor *color,int tag, int red) void message_read_float(message_t m,float *f,int tag,int data) { fprintf(stderr,">>>>> Warning:message_read_float: Not implemented.\n"); + fflush(stderr); } @@ -448,6 +452,7 @@ void toolkit_write_value(message_t message, caddr_t value, String type) type_tag = find_type_entry(type); if( type_tag < 0 ) { fprintf(stderr,"Choked on type %s\n",type); + fflush(stderr); fatal_error("Illegal type specified."); } diff --git a/motif/server/events.c b/motif/server/events.c index eb08a103e88cf5a283e32ed3aa3fbfe14c564747..ef24d39ed1d70d19f73386cff6b721bf127c1fc8 100644 --- a/motif/server/events.c +++ b/motif/server/events.c @@ -362,6 +362,7 @@ void write_event(message_t reply,XEvent *event) break; default: printf("Unknown event type %d\n",event->type); + fflush(stdout); break; } } diff --git a/motif/server/main.c b/motif/server/main.c index c6bdb9ee1eeee4c5c07efe5bd4d150ea78dc30dc..4ac300ddae3806d0d2545cdf35a01572570a1264 100644 --- a/motif/server/main.c +++ b/motif/server/main.c @@ -124,6 +124,7 @@ void establish_client(int s) else printf("Server not forking.\n"); + fflush(stdout); switch( pid ) { case 0: /* The child process */ close(unix_socket); @@ -197,6 +198,8 @@ main(int argc, char **argv) else printf(" No Unix domain socket created.\n"); + fflush(stdout); + start_server(port, socket_path); /* Catch signals and remove our sockets before going away. */ @@ -205,6 +208,7 @@ main(int argc, char **argv) signal(SIGQUIT, server_shutdown); printf("Waiting for connection.\n"); + fflush(stdout); FD_ZERO(&rfds); nfds = MAX(unix_socket,inet_socket)+1; @@ -217,10 +221,12 @@ main(int argc, char **argv) if( FD_ISSET(unix_socket, &rfds) ) { printf("Accepting client on Unix socket.\n"); + fflush(stdout); establish_client(unix_socket); } if( FD_ISSET(inet_socket, &rfds) ) { printf("Accepting client on Inet socket.\n"); + fflush(stdout); establish_client(inet_socket); } /* Prevent zombie children under Mach */ diff --git a/motif/server/message.c b/motif/server/message.c index a0e09c6db46453a9895b41f525818c11d7dce9d4..85f7f3ad39568bc86d23084b85b105a7e6f257e7 100644 --- a/motif/server/message.c +++ b/motif/server/message.c @@ -206,8 +206,9 @@ message_t message_read(int socket) { count=first->total; if( !count && !first->current ) { kill_deferred_message(first->serial); - if( global_will_trace ) + if( global_will_trace ) { printf("Got cancellation for serial %d\n",first->serial); + fflush(stdout); } } else if( count == 1 ) { new = message_new(next_serial++); new->packets = first; diff --git a/motif/server/packet.c b/motif/server/packet.c index 3508e519c10396e6d99f4416a8f70d32346df888..aee6fcab1e5777c9d616f31ce65bb41e5c3a49b9 100644 --- a/motif/server/packet.c +++ b/motif/server/packet.c @@ -119,6 +119,7 @@ void packet_send(int socket, packet_t packet) { printf("packet_send: length = %u\n",packet->length); printf("packet_send: this is packet %d of %d\n",packet->current, packet->total); + fflush(stdout); } packet_build_header(packet); @@ -159,6 +160,7 @@ void packet_read(int socket, packet_t packet) { printf("packet_read: length = %u\n",packet->length); printf("packet_read: This is packet %d of %d\n",packet->current, packet->total); + fflush(stdout); } while( target ) { diff --git a/motif/server/requests.c b/motif/server/requests.c index cef5d9279c9ec6a2d4d9bac75ddc46bd20de0620..96dcf8ca9117405e05d7e4119fa7e07649e3e342 100644 --- a/motif/server/requests.c +++ b/motif/server/requests.c @@ -155,8 +155,9 @@ void process_request(message_t message,int socket) message_get_byte(message); /* This is ignored at the moment */ handler = request_table[request_op]; - if( global_will_trace ) + if( global_will_trace ) { printf("Dispatching request for %d\n",request_op); + fflush(stdout);} (*handler)(message); if( must_confirm ) send_confirmation(message,socket); diff --git a/motif/server/server.c b/motif/server/server.c index 54f2c4ea98f6ea099a4a464331927a9f8a66473f..4ef05ec87dbbdc1abb2ad15375964d30421c0814 100644 --- a/motif/server/server.c +++ b/motif/server/server.c @@ -32,6 +32,7 @@ void fatal_error(char *message) fprintf(stderr,"%s\n",message); if( errno ) perror(NULL); + fflush(stderr); close(client_socket); if( !will_fork ) { @@ -47,6 +48,7 @@ void MyErrorHandler(String errmsg) message_add_packet(reply); fprintf(stderr,"Error: %s\n",errmsg); + fflush(stderr); message_put_dblword(reply,ERROR_REPLY); message_write_string(reply,errmsg,string_tag); message_send(client_socket,reply); @@ -62,6 +64,7 @@ void MyWarningHandler(String errmsg) message_add_packet(reply); fprintf(stderr,"Warning: %s\n",errmsg); + fflush(stderr); message_put_dblword(reply,WARNING_REPLY); message_write_string(reply,errmsg,string_tag); message_send(client_socket,reply); @@ -73,14 +76,16 @@ void get_input(caddr_t closure, int *socket, XtInputId *id) { message_t message; - if( global_will_trace ) + if( global_will_trace ) { printf("get_input: Receiving incoming packet.\n"); + fflush(stdout);} message = message_read(*socket); process_request(message,*socket); - if( global_will_trace ) + if( global_will_trace ) { printf("get_input: Successfully digested packet. Now freeing.\n"); + fflush(stdout);} message_free(message); } @@ -97,8 +102,9 @@ void greet_client(int socket) { else if( result == 1 ) read(socket,&byte+1,1); swap_bytes = (byte!=1); - if( global_will_trace ) + if( global_will_trace ) { printf("swap_bytes is: %d (from %d)\n",swap_bytes,byte); + fflush(stdout);} /* Read initial packet */ first = message_read(socket); @@ -112,9 +118,10 @@ void greet_client(int socket) { global_app_class = XtNewString(app_class); global_app_name = XtNewString(app_name); - if( global_will_trace ) + if( global_will_trace ) { printf("Opening display on '%s' for app '%s' class '%s'\n",dpy_name, app_name,app_class); + fflush(stdout)}; display = XtOpenDisplay(app_context, dpy_name, app_name, app_class, NULL, 0, @@ -168,8 +175,9 @@ void serve_client(int socket) XtAppSetWarningHandler(app_context, MyWarningHandler); /* Here is where we want to return on errors */ - if( setjmp(env) ) + if( setjmp(env) ) { printf("Attempting to recover from error.\n"); + fflush(stdout);} while( !terminate_server ) { XtAppNextEvent(app_context, &event); XtDispatchEvent(&event);