enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Add a way to save error messages from e_app_error dialogue. Logs default to ~/<appname>.log . Add 2 missing function protos. Some formatting. 

SVN revision: 20560
This commit is contained in:
Christopher Michael 2006-02-18 12:14:41 +00:00
parent 47e7c5f243
commit 3c25682444
1 changed files with 228 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

357
src/bin/e_apps_error.c
View File

@ -3,7 +3,6 @@
*/ */
#include "e.h" #include "e.h"
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
char *label; char *label;
@ -11,12 +10,14 @@ struct _E_Config_Dialog_Data
char *signal; char *signal;
}; };
/* Protos */ /* Protos */
static void * _e_app_error_dialog_create_data(E_Config_Dialog *cfd); static void * _e_app_error_dialog_create_data(E_Config_Dialog *cfd);
static void _e_app_error_dialog_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _e_app_error_dialog_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static Evas_Object *_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _e_app_error_dialog_resize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static Evas_Object *_e_app_error_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines);
static void _e_app_error_dialog_save_cb(void *data, void *data2);
EAPI void EAPI void
e_app_error_dialog(E_Container *con, E_App_Autopsy *app) e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
@ -26,17 +27,17 @@ e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog. */ v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog. */
if (v) if (v)
{ {
/* Dialog Methods */ /* Dialog Methods */
v->create_cfdata = _e_app_error_dialog_create_data; v->create_cfdata = _e_app_error_dialog_create_data;
v->free_cfdata = _e_app_error_dialog_free_data; v->free_cfdata = _e_app_error_dialog_free_data;
v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets;
v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets;
/* Create The Dialog */ /* Create The Dialog */
cfd = e_config_dialog_new(con, _("Application Execution Error"), NULL, 0, v, app); cfd = e_config_dialog_new(con, _("Application Execution Error"), NULL, 0, v, app);
app->error_dialog = cfd; app->error_dialog = cfd;
} }
} }
static void static void
@ -45,72 +46,72 @@ _e_app_error_dialog_fill_data(E_App_Autopsy *app, E_Config_Dialog_Data *cfdata)
char buf[4096]; char buf[4096];
if (!cfdata->label) if (!cfdata->label)
{ {
snprintf(buf, sizeof(buf), _("%s stopped running unexpectedly."), snprintf(buf, sizeof(buf), _("%s stopped running unexpectedly."),
app->app->name); app->app->name);
cfdata->label = strdup(buf); cfdata->label = strdup(buf);
} }
if ((app->del.exited) && (!cfdata->exit)) if ((app->del.exited) && (!cfdata->exit))
{ {
snprintf(buf, sizeof(buf), _("An exit code of %i was returned from %s"), snprintf(buf, sizeof(buf), _("An exit code of %i was returned from %s"),
app->del.exit_code, app->app->exe); app->del.exit_code, app->app->exe);
cfdata->exit = strdup(buf); cfdata->exit = strdup(buf);
} }
if ((app->del.signalled) && (!cfdata->signal)) if ((app->del.signalled) && (!cfdata->signal))
{ {
if (app->del.exit_signal == SIGINT) if (app->del.exit_signal == SIGINT)
snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Signal"), snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Signal"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGQUIT) else if (app->del.exit_signal == SIGQUIT)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGABRT) else if (app->del.exit_signal == SIGABRT)
snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Signal"), snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Signal"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGFPE) else if (app->del.exit_signal == SIGFPE)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point Error"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point Error"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGKILL) else if (app->del.exit_signal == SIGKILL)
snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Signal"), snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Signal"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGSEGV) else if (app->del.exit_signal == SIGSEGV)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation Fault"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation Fault"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGPIPE) else if (app->del.exit_signal == SIGPIPE)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Broken Pipe"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Broken Pipe"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGTERM) else if (app->del.exit_signal == SIGTERM)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Termination Singal"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Termination Singal"),
app->app->exe); app->app->exe);
else if (app->del.exit_signal == SIGBUS) else if (app->del.exit_signal == SIGBUS)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"), snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
app->app->exe); app->app->exe);
else else
snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number %i"), snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number %i"),
app->app->exe, app->del.exit_signal); app->app->exe, app->del.exit_signal);
cfdata->signal = strdup(buf); cfdata->signal = strdup(buf);
/* FIXME: Add sigchld_info stuff /* FIXME: Add sigchld_info stuff
* app->del.data * app->del.data
* siginfo_t * siginfo_t
* { * {
* int si_signo; Signal number * int si_signo; Signal number
* int si_errno; An errno value * int si_errno; An errno value
* int si_code; Signal code * int si_code; Signal code
* pid_t si_pid; Sending process ID * pid_t si_pid; Sending process ID
* uid_t si_uid; Real user ID of sending process * uid_t si_uid; Real user ID of sending process
* int si_status; Exit value or signal * int si_status; Exit value or signal
* clock_t si_utime; User time consumed * clock_t si_utime; User time consumed
* clock_t si_stime; System time consumed * clock_t si_stime; System time consumed
* sigval_t si_value; Signal value * sigval_t si_value; Signal value
* int si_int; POSIX.1b signal * int si_int; POSIX.1b signal
* void * si_ptr; POSIX.1b signal * void * si_ptr; POSIX.1b signal
* void * si_addr; Memory location which caused fault * void * si_addr; Memory location which caused fault
* int si_band; Band event * int si_band; Band event
* int si_fd; File descriptor * int si_fd; File descriptor
* } * }
*/ */
} }
} }
static void * static void *
@ -133,20 +134,20 @@ _e_app_error_dialog_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata
app = cfd->data; app = cfd->data;
if(app) if(app)
{ {
app->error_dialog = NULL; app->error_dialog = NULL;
if (app->error) if (app->error)
ecore_exe_event_data_free(app->error); ecore_exe_event_data_free(app->error);
if (app->read) if (app->read)
ecore_exe_event_data_free(app->read); ecore_exe_event_data_free(app->read);
free(app); free(app);
} }
if (cfdata->signal) if (cfdata->signal)
free(cfdata->signal); free(cfdata->signal);
if (cfdata->exit) if (cfdata->exit)
free(cfdata->exit); free(cfdata->exit);
if (cfdata->label) if (cfdata->label)
free(cfdata->label); free(cfdata->label);
free(cfdata); free(cfdata);
} }
@ -214,17 +215,20 @@ _e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Con
e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_list_object_append(o, ob, 1, 1, 0.5);
if (app->error) if (app->error)
error_length = app->error->size; error_length = app->error->size;
if (error_length) if (error_length)
{ {
os = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"), app->error->lines); os = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"), app->error->lines);
e_widget_list_object_append(o, os, 1, 1, 0.5); e_widget_list_object_append(o, os, 1, 1, 0.5);
} }
else else
{ {
ob = e_widget_label_add(evas, _("There was no error message.")); ob = e_widget_label_add(evas, _("There was no error message."));
e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_list_object_append(o, ob, 1, 1, 0.5);
} }
ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run", _e_app_error_dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
return o; return o;
} }
@ -247,55 +251,150 @@ _e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_
e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_list_object_append(o, ob, 1, 1, 0.5);
if (cfdata->exit) if (cfdata->exit)
{ {
of = e_widget_framelist_add(evas, _("Error Information"), 0); of = e_widget_framelist_add(evas, _("Error Information"), 0);
ob = e_widget_label_add(evas, _(cfdata->exit)); ob = e_widget_label_add(evas, _(cfdata->exit));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
} }
if (cfdata->signal) if (cfdata->signal)
{ {
of = e_widget_framelist_add(evas, _("Error Signal Information"), 0); of = e_widget_framelist_add(evas, _("Error Signal Information"), 0);
ob = e_widget_label_add(evas, _(cfdata->signal)); ob = e_widget_label_add(evas, _(cfdata->signal));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
} }
if (app->read) if (app->read)
read_length = app->read->size; read_length = app->read->size;
if (read_length) if (read_length)
{ {
of = _e_app_error_dialog_scrolltext_create(evas, _("Output Data"), app->read->lines); of = _e_app_error_dialog_scrolltext_create(evas, _("Output Data"), app->read->lines);
/* FIXME: Add stdout "start". */ /* FIXME: Add stdout "start". */
/* FIXME: Add stdout "end". */ /* FIXME: Add stdout "end". */
} }
else else
{ {
of = e_widget_framelist_add(evas, _("Output Data"), 0); of = e_widget_framelist_add(evas, _("Output Data"), 0);
ob = e_widget_label_add(evas, _("There was no output.")); ob = e_widget_label_add(evas, _("There was no output."));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
} }
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
if (app->error) if (app->error)
error_length = app->error->size; error_length = app->error->size;
if (error_length) if (error_length)
{ {
of = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"), app->error->lines); of = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"), app->error->lines);
/* FIXME: Add stderr "start". */ /* FIXME: Add stderr "start". */
/* FIXME: Add stderr "end". */ /* FIXME: Add stderr "end". */
} }
else else
{ {
of = e_widget_framelist_add(evas, _("Error Logs"), 0); of = e_widget_framelist_add(evas, _("Error Logs"), 0);
ob = e_widget_label_add(evas, _("There was no error message.")); ob = e_widget_label_add(evas, _("There was no error message."));
e_widget_framelist_object_append(of, ob); e_widget_framelist_object_append(of, ob);
} }
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5); e_widget_list_object_append(o, ot, 1, 1, 0.5);
ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run", _e_app_error_dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
return o; return o;
} }
static void
_e_app_error_dialog_save_cb(void *data, void *data2)
{
E_App_Autopsy *app;
E_Config_Dialog_Data *cfdata;
FILE *f;
char *text;
char buf[1024];
char buffer[4096];
int read_length = 0;
int i, tlen;
app = data;
cfdata = data2;
snprintf(buf, sizeof(buf), "%s/%s.log", e_user_homedir_get(), app->app->name);
f = fopen(buf, "w");
if (!f)
return;
if (cfdata->exit)
{
snprintf(buffer, sizeof(buffer), "Error Information:\n\t%s\n\n", cfdata->exit);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
if (cfdata->signal)
{
snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n", cfdata->signal);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
if (app->read)
read_length = app->read->size;
if (read_length)
{
tlen = 0;
for (i = 0; app->read->lines[i].line != NULL; i++)
tlen += app->read->lines[i].size + 1;
text = alloca(tlen + 1);
if (text)
{
text[0] = 0;
for (i = 0; app->read->lines[i].line != NULL; i++)
{
strcat(text, "\t");
strcat(text, app->read->lines[i].line);
strcat(text, "\n");
}
snprintf(buffer, sizeof(buffer), "Output Data:\n%s\n\n", text);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
}
else
{
snprintf(buffer, sizeof(buffer), "Output Data:\n\tThere was no output\n\n");
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
/* Reusing this var */
read_length = 0;
if (app->error)
read_length = app->error->size;
if (read_length)
{
tlen = 0;
for (i = 0; app->error->lines[i].line != NULL; i++)
tlen += app->error->lines[i].size + 1;
text = alloca(tlen + 1);
if (text)
{
text[0] = 0;
for (i = 0; app->error->lines[i].line != NULL; i++)
{
strcat(text, "\t");
strcat(text, app->error->lines[i].line);
strcat(text, "\n");
}
snprintf(buffer, sizeof(buffer), "Error Logs:\n%s\n", text);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
}
else
{
snprintf(buffer, sizeof(buffer), "Error Logs:\n\tThere was no error message\n");
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
fclose(f);
}