X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Ftracecontrol%2Ftracecontrol.c;h=bc7ec1882ed67c5b875e0517ff5ca3d297804df2;hb=e433e6d6da2cc572a3d14257abe18bc3afd5c7e6;hp=a44fa27bcd85c2224a04240dd1700f07f4e73294;hpb=06e9af2da9d41f31e88c454725bc43dc131b132d;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c index a44fa27b..bc7ec188 100644 --- a/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c +++ b/ltt/branches/poly/lttv/modules/gui/tracecontrol/tracecontrol.c @@ -21,6 +21,7 @@ #endif #include +#include #include #include #include @@ -32,6 +33,7 @@ #include #include +#include #include "hTraceControlInsert.xpm" #include "TraceControlStart.xpm" @@ -46,6 +48,8 @@ #include #include #include +#include +#include #define MAX_ARGS_LEN PATH_MAX * 10 @@ -65,9 +69,9 @@ typedef struct _ControlData ControlData; * Prototypes */ GtkWidget *guicontrol_get_widget(ControlData *tcd); -ControlData *gui_control(Tab *tab); +ControlData *gui_control(GObject *obj); void gui_control_destructor(ControlData *tcd); -GtkWidget* h_guicontrol(Tab *tab); +GtkWidget* h_guicontrol(GObject *obj); void control_destroy_walk(gpointer data, gpointer user_data); /* @@ -116,6 +120,8 @@ struct _ControlData { GtkWidget *subbuf_size_entry; GtkWidget *subbuf_num_label; GtkWidget *subbuf_num_entry; + GtkWidget *lttd_threads_label; + GtkWidget *lttd_threads_entry; GtkWidget *lttctl_path_label; GtkWidget *lttctl_path_entry; GtkWidget *lttd_path_label; @@ -146,8 +152,9 @@ guicontrol_get_widget(ControlData *tcd) * @return The Filter viewer data created. */ ControlData* -gui_control(Tab *tab) +gui_control(GObject *obj) { + Tab *tab = g_object_get_data(obj, "Tab"); g_debug("filter::gui_control()"); unsigned i; @@ -309,13 +316,21 @@ gui_control(Tab *tab) gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->subbuf_num_label,0,2,10,11,GTK_FILL,GTK_FILL,2,2); gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->subbuf_num_entry,2,6,10,11,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + tcd->lttd_threads_label = gtk_label_new("Number of lttd threads:"); + gtk_widget_show (tcd->lttd_threads_label); + tcd->lttd_threads_entry = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(tcd->lttd_threads_entry), "1"); + gtk_widget_show (tcd->lttd_threads_entry); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_threads_label,0,2,11,12,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_threads_entry,2,6,11,12,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + tcd->lttctl_path_label = gtk_label_new("path to lttctl:"); gtk_widget_show (tcd->lttctl_path_label); tcd->lttctl_path_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(tcd->lttctl_path_entry),PACKAGE_BIN_DIR "/lttctl"); gtk_widget_show (tcd->lttctl_path_entry); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttctl_path_label,0,2,11,12,GTK_FILL,GTK_FILL,2,2); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttctl_path_entry,2,6,11,12,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttctl_path_label,0,2,12,13,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttctl_path_entry,2,6,12,13,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); tcd->lttd_path_label = gtk_label_new("path to lttd:"); @@ -323,18 +338,18 @@ gui_control(Tab *tab) tcd->lttd_path_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(tcd->lttd_path_entry),PACKAGE_BIN_DIR "/lttd"); gtk_widget_show (tcd->lttd_path_entry); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_path_label,0,2,12,13,GTK_FILL,GTK_FILL,2,2); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_path_entry,2,6,12,13,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_path_label,0,2,13,14,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->lttd_path_entry,2,6,13,14,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); tcd->fac_path_label = gtk_label_new("path to facilities:"); gtk_widget_show (tcd->fac_path_label); tcd->fac_path_entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(tcd->fac_path_entry),PACKAGE_DATA_DIR "/" PACKAGE "/facilities"); + gtk_entry_set_text(GTK_ENTRY(tcd->fac_path_entry),PACKAGE_DATA_DIR "/" "ltt-control" "/facilities"); gtk_widget_set_size_request(tcd->fac_path_entry, 250, -1); gtk_widget_show (tcd->fac_path_entry); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->fac_path_label,0,2,13,14,GTK_FILL,GTK_FILL,2,2); - gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->fac_path_entry,2,6,13,14,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->fac_path_label,0,2,14,15,GTK_FILL,GTK_FILL,2,2); + gtk_table_attach( GTK_TABLE(tcd->main_box),tcd->fac_path_entry,2,6,14,15,GTK_FILL|GTK_EXPAND|GTK_SHRINK,GTK_FILL,0,0); focus_chain = g_list_append (focus_chain, tcd->username_entry); focus_chain = g_list_append (focus_chain, tcd->password_entry); @@ -350,6 +365,7 @@ gui_control(Tab *tab) focus_chain = g_list_append (focus_chain, tcd->append_check); focus_chain = g_list_append (focus_chain, tcd->subbuf_size_entry); focus_chain = g_list_append (focus_chain, tcd->subbuf_num_entry); + focus_chain = g_list_append (focus_chain, tcd->lttd_threads_entry); focus_chain = g_list_append (focus_chain, tcd->lttctl_path_entry); focus_chain = g_list_append (focus_chain, tcd->lttd_path_entry); focus_chain = g_list_append (focus_chain, tcd->fac_path_entry); @@ -436,26 +452,29 @@ static int execute_command(const gchar *command, const gchar *username, struct pollfd pollfd; int num_rdy; int num_hup = 0; + enum read_state { GET_LINE, GET_SEMI, GET_SPACE } read_state = GET_LINE; + retval = fcntl(fdpty, F_SETFL, O_WRONLY); + if(retval == -1) { + perror("Error in fcntl"); + goto wait_child; + } /* Read the output from the child terminal before the prompt. If no data in * 200 ms, we stop reading to give the password */ g_info("Reading from child console..."); - sleep(1); /* make sure the child is ready */ while(1) { pollfd.fd = fdpty; pollfd.events = POLLIN|POLLPRI|POLLERR|POLLHUP|POLLNVAL; - num_rdy = poll(&pollfd, 1, 200); -#if 0 + num_rdy = poll(&pollfd, 1, -1); if(num_rdy == -1) { perror("Poll error"); goto wait_child; } -#endif //0 - /* Timeout : stop waiting for chars */ - if(num_rdy == 0) break; + /* Timeout : Stop waiting for chars */ + if(num_rdy == 0) goto wait_child; switch(pollfd.revents) { case POLLERR: @@ -474,8 +493,31 @@ static int execute_command(const gchar *command, const gchar *username, case POLLIN: count = read (fdpty, buf, 256); if(count > 0) { + unsigned int i; buf[count] = '\0'; - printf("%s", buf); + g_printf("%s", buf); + for(i=0; i 0) { + buf[count] = '\0'; + printf("%s", buf); + } else if(count == -1) { + perror("Error in read"); + goto wait_child; + } + } + + if(pollfd.revents & POLLHUP) { + g_info("Polling FD : hung up."); + num_hup++; + } - switch(pollfd.revents) { - case POLLERR: - g_warning("Error returned in polling fd\n"); - num_hup++; - break; - case POLLHUP: - g_info("Polling FD : hung up."); - num_hup++; - break; - case POLLNVAL: - g_warning("Polling fd tells it is not open"); - num_hup++; - break; - case POLLPRI: - case POLLIN: - count = read (fdpty, buf, 256); - if(count > 0) { - buf[count] = '\0'; - printf("%s", buf); - } else if(count == -1) { - perror("Error in read"); - goto wait_child; - } - break; - } if(num_hup > 0) goto wait_child; } wait_child: @@ -566,7 +612,8 @@ wait_child: if(strcmp(fac_path, "") != 0) setenv("LTT_FACILITIES", fac_path, 1); - g_message("Executing (as %s) : %s\n", username, command); + /* One comment line (must be only one) */ + g_printf("Executing (as %s) : %s\n", username, command); execlp("su", "su", "-p", "-c", command, username, NULL); exit(-1); /* not supposed to happen! */ @@ -621,6 +668,8 @@ void start_clicked (GtkButton *button, gpointer user_data) gtk_entry_get_text(GTK_ENTRY(tcd->subbuf_size_entry)); const gchar *subbuf_num = gtk_entry_get_text(GTK_ENTRY(tcd->subbuf_num_entry)); + const gchar *threads_num = + gtk_entry_get_text(GTK_ENTRY(tcd->lttd_threads_entry)); const gchar *lttctl_path = gtk_entry_get_text(GTK_ENTRY(tcd->lttctl_path_entry)); const gchar *lttd_path = gtk_entry_get_text(GTK_ENTRY(tcd->lttd_path_entry)); @@ -737,6 +786,18 @@ void start_clicked (GtkButton *button, gpointer user_data) args_left = MAX_ARGS_LEN - strlen(args) - 1; } + /* number of lttd threads */ + if(strcmp(threads_num, "") != 0) { + /* space */ + strncat(args, " ", args_left); + args_left = MAX_ARGS_LEN - strlen(args) - 1; + + strncat(args, "-N ", args_left); + args_left = MAX_ARGS_LEN - strlen(args) - 1; + strncat(args, threads_num, args_left); + args_left = MAX_ARGS_LEN - strlen(args) - 1; + } + int retval = execute_command(args, username, password, lttd_path, fac_path); @@ -1029,9 +1090,9 @@ void stop_clicked (GtkButton *button, gpointer user_data) * @return The widget created. */ GtkWidget * -h_guicontrol(Tab *tab) +h_guicontrol(GObject *obj) { - ControlData* f = gui_control(tab) ; + ControlData* f = gui_control(obj); return NULL; }