Skip to content

No curses! #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wdoekes merged 3 commits into from
May 14, 2015
Merged

No curses! #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15b6383
Check stdout before starting ncurses
May 6, 2015
d25c54b
Decouple signal handling from ncurses
May 6, 2015
9ba5798
Rotate log when ncurses is disabled
vodik May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/screen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ extern "C" {
#define EXIT_BIND_ERROR -2

void screen_set_exename(char * exe_name);
void screen_init(void (*exit_handler)());
void screen_init();
void screen_clear();
int screen_readkey();
void screen_exit(int rc);
void screen_sigusr1(int /* not used */);
void screen_exit();
void screen_show_errors();

#endif // __SCREEN_H__
3 changes: 3 additions & 0 deletions include/sipp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ extern bool twinSippMode _DEFVAL(false);
extern bool extendedTwinSippMode _DEFVAL(false);

extern bool nostdin _DEFVAL(false);
extern bool nostdout _DEFVAL(false);
extern bool backgroundMode _DEFVAL(false);
extern bool signalDump _DEFVAL(false);

Expand Down Expand Up @@ -478,6 +479,8 @@ enum E_Alter_YesNo {

#include "strings.hpp"

void sipp_exit(int rc);

char *get_peer_addr(char *);

bool reconnect_allowed();
Expand Down
2 changes: 1 addition & 1 deletion src/call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3826,7 +3826,7 @@ call::T_ActionResult call::executeAction(char * msg, message *curmsg)
quitting = 1;
break;
case CAction::E_INTCMD_STOP_NOW:
screen_exit(EXIT_TEST_RES_INTERNAL);
sipp_exit(EXIT_TEST_RES_INTERNAL);
break;
case CAction::E_INTCMD_STOPCALL:
default:
Expand Down
4 changes: 2 additions & 2 deletions src/logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@ void print_statistics(int last)
extern char *command_buffer;

if(backgroundMode == false && display_scenario) {
if(!last) {
if (!nostdout && !last) {
screen_clear();
}

if(first) {
if (!nostdout && first) {
first = 0;
printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
Expand Down
196 changes: 33 additions & 163 deletions src/screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,13 @@ int screen_inited = 0;
char screen_exename[255];
extern bool backgroundMode;

void (*screen_exit_handler)();

/* Clock must be a pointer to struct timeval */
#define GET_TIME(clock) \
{ \
struct timezone tzp; \
gettimeofday (clock, &tzp); \
}

void stop_all_traces()
{
message_lfi.fptr = NULL;
log_lfi.fptr = NULL;
if(dumpInRtt) dumpInRtt = 0;
if(dumpInFile) dumpInFile = 0;
}

/* ERR is actually -1, but this prevents us from needing to use curses.h in
* sipp.cpp. */
int screen_readkey()
Expand All @@ -75,137 +65,32 @@ int screen_readkey()
return c;
}

void freeInFiles()
{
for (file_map::iterator file_it = inFiles.begin(); file_it != inFiles.end(); file_it++) {
delete file_it->second;
}
}

void freeUserVarMap()
{
for (int_vt_map::iterator vt_it = userVarMap.begin(); vt_it != userVarMap.end(); vt_it++) {
vt_it->second->putTable();
userVarMap[vt_it->first] = NULL;
}
}

void releaseGlobalAllocations()
{
delete main_scenario;
delete ooc_scenario;
delete aa_scenario;
free_default_messages();
freeInFiles();
freeUserVarMap();
delete globalVariables;
}

void screen_exit(int rc)
void screen_exit()
{
unsigned long counter_value_failed=0;
unsigned long counter_value_success=0;

/* Some signals may be delivered twice during exit() execution,
* and we must prevent all this from beeing done twice */

{
static int already_exited = 0;
if(already_exited) {
return;
}
already_exited = 1;
}

if( backgroundMode == false )
endwin();
}

if(screen_exit_handler) {
screen_exit_handler();
}

if(screen_errors) {
fprintf(stderr, "%s", screen_last_error);
if(screen_errors > 1) {
if (screen_logfile[0] != (char)0) {
fprintf(stderr,
"%s: There were more errors, see '%s' file\n",
screen_exename, screen_logfile);
} else {
fprintf(stderr,
"%s: There were more errors, enable -trace_err to log them.\n",
screen_exename);
}
}
fflush(stderr);
}

// Get failed calls counter value before releasing objects
if (display_scenario) {
counter_value_failed = display_scenario->stats->GetStat (CStat::CPT_C_FailedCall);
counter_value_success = display_scenario->stats->GetStat (CStat::CPT_C_SuccessfulCall);
} else {
rc = EXIT_TEST_FAILED;
void screen_show_errors() {
if (!screen_errors) {
return;
}

releaseGlobalAllocations();

if (rc != EXIT_TEST_RES_UNKNOWN) {
// Exit is not a normal exit. Just use the passed exit code.
exit(rc);
} else {
// Normal exit: we need to determine if the calls were all
// successful or not.
// In order to compute the return code, get the counter
// of failed calls. If there is 0 failed calls, then everything is OK!
if (counter_value_failed == 0) {

if ((timeout_exit) && (counter_value_success < 1)) {

exit (EXIT_TEST_RES_INTERNAL);
} else {
exit(EXIT_TEST_OK);
}
fprintf(stderr, "%s", screen_last_error);
if (screen_errors > 1) {
if (screen_logfile[0] != '\0') {
fprintf(stderr,
"%s: There were more errors, see '%s' file\n",
screen_exename, screen_logfile);
} else {
exit(EXIT_TEST_FAILED);
fprintf(stderr,
"%s: There were more errors, enable -trace_err to log them.\n",
screen_exename);
}
}
fflush(stderr);
}

/* Exit handler for Curses */

void screen_quit()
{
screen_exit(EXIT_TEST_RES_UNKNOWN);
}


void manage_oversized_file()
{
FILE * f;
char L_file_name [MAX_PATH];
struct timeval currentTime;
static int managing = 0;

if(managing) return; //we can receive this signal more than once

managing = 1;

sprintf (L_file_name, "%s_%d_traces_oversized.log", scenario_file, getpid());
f = fopen(L_file_name, "w");
if(!f) ERROR_NO("Unable to open special error file\n");
GET_TIME (&currentTime);
fprintf(f,
"-------------------------------------------- %s\n"
"Max file size reached - no more logs\n",
CStat::formatTime(&currentTime));
fflush(f);
stop_all_traces();
print_all_responses = 0;
error_lfi.fptr = NULL;
}


void screen_clear()
{
printf("\033[2J");
Expand All @@ -216,38 +101,23 @@ void screen_set_exename(char * exe_name)
strcpy(screen_exename, exe_name);
}

void screen_init(void (*exit_handler)())
void screen_init()
{
struct sigaction action_quit, action_file_size_exceeded;

screen_inited = 1;
screen_exit_handler = exit_handler;

if (backgroundMode == false) {
/* Initializes curses and signals */
initscr();
/* Enhance performances and display */
noecho();
if (backgroundMode) {
return;
}

/* Map exit handlers to curses reset procedure */
memset(&action_quit, 0, sizeof(action_quit));
memset(&action_file_size_exceeded, 0, sizeof(action_file_size_exceeded));
(*(void **)(&(action_quit.sa_handler)))=(void *)screen_quit;
(*(void **)(&(action_file_size_exceeded.sa_handler)))=(void *)manage_oversized_file;
sigaction(SIGTERM, &action_quit, NULL);
sigaction(SIGINT, &action_quit, NULL);
sigaction(SIGXFSZ, &action_file_size_exceeded, NULL); // avoid core dump if the max file size is exceeded
screen_inited = 1;

if (backgroundMode == false) {
screen_clear();
}
initscr();
noecho();
screen_clear();
}

static void _screen_error(int fatal, bool use_errno, int error, const char *fmt, va_list ap)
{
static unsigned long long count = 0;
char * c = screen_last_error;
char *c = screen_last_error;
struct timeval currentTime;

CStat::globalStat(fatal ? CStat::E_FATAL_ERRORS : CStat::E_WARNING);
Expand All @@ -262,20 +132,20 @@ static void _screen_error(int fatal, bool use_errno, int error, const char *fmt,
c+= sprintf(c, ".\n");
screen_errors++;

if(screen_inited && !error_lfi.fptr && print_all_responses) {
if (!error_lfi.fptr && print_all_responses) {
rotate_errorf();
if(!error_lfi.fptr) {
if (screen_inited && !error_lfi.fptr) {
sprintf(c, "%s: Unable to create '%s': %s.\n",
screen_exename, screen_logfile, strerror(errno));
screen_exit(EXIT_FATAL_ERROR);
sipp_exit(EXIT_FATAL_ERROR);
} else {
fprintf(error_lfi.fptr, "%s: The following events occured:\n",
screen_exename);
fflush(error_lfi.fptr);
}
}

if(error_lfi.fptr) {
if (error_lfi.fptr) {
count += fprintf(error_lfi.fptr, "%s", screen_last_error);
fflush(error_lfi.fptr);
if (ringbuffer_size && count > ringbuffer_size) {
Expand All @@ -296,18 +166,18 @@ static void _screen_error(int fatal, bool use_errno, int error, const char *fmt,
fflush(stderr);
}

if(fatal) {
if(!screen_inited) {
if(error == EADDRINUSE) {
if (fatal) {
if (!screen_inited) {
if (error == EADDRINUSE) {
exit(EXIT_BIND_ERROR);
} else {
exit(EXIT_FATAL_ERROR);
}
} else {
if(error == EADDRINUSE) {
screen_exit(EXIT_BIND_ERROR);
if (error == EADDRINUSE) {
sipp_exit(EXIT_BIND_ERROR);
} else {
screen_exit(EXIT_FATAL_ERROR);
sipp_exit(EXIT_FATAL_ERROR);
}
}
}
Expand Down
Loading