X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_local.c;h=374d5fd479c052501b75c564cae9e9a5652ecaa3;hb=a9f812df2a5071517dd3bb30cc80378f2e3cbe06;hp=501487a4925946422dcb6d280735b22d890af8ce;hpb=80a5c8297b313b09add80814a637a71ba9e0fa05;p=melted diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c index 501487a..374d5fd 100644 --- a/src/miracle/miracle_local.c +++ b/src/miracle/miracle_local.c @@ -27,6 +27,11 @@ #include #include +/* Needed for backtrace on linux */ +#ifdef linux +#include +#endif + /* Valerie header files */ #include @@ -126,7 +131,8 @@ typedef enum ATYPE_NONE, ATYPE_FLOAT, ATYPE_STRING, - ATYPE_INT + ATYPE_INT, + ATYPE_PAIR } arguments_types; @@ -164,7 +170,7 @@ static command_t vocabulary[] = {"UADD", miracle_add_unit, 0, ATYPE_STRING, "Create a new DV unit (virtual VTR) to transmit to receiver specified in GUID argument."}, {"ULS", miracle_list_units, 0, ATYPE_NONE, "Lists the units that have already been added to the server."}, {"CLS", miracle_list_clips, 0, ATYPE_STRING, "Lists the clips at directory name argument."}, - {"SET", miracle_set_global_property, 0, ATYPE_STRING, "Set a server configuration property."}, + {"SET", miracle_set_global_property, 0, ATYPE_PAIR, "Set a server configuration property."}, {"GET", miracle_get_global_property, 0, ATYPE_STRING, "Get a server configuration property."}, {"RUN", miracle_run, 0, ATYPE_STRING, "Run a batch file." }, {"LIST", miracle_list, 1, ATYPE_NONE, "List the playlist associated to a unit."}, @@ -172,6 +178,7 @@ static command_t vocabulary[] = {"INSERT", miracle_insert, 1, ATYPE_STRING, "Insert a clip at the given clip index."}, {"REMOVE", miracle_remove, 1, ATYPE_NONE, "Remove a clip at the given clip index."}, {"CLEAN", miracle_clean, 1, ATYPE_NONE, "Clean a unit by removing all but the currently playing clip."}, + {"CLEAR", miracle_clear, 1, ATYPE_NONE, "Clear a unit by removing all clips."}, {"MOVE", miracle_move, 1, ATYPE_INT, "Move a clip to another clip index."}, {"APND", miracle_append, 1, ATYPE_STRING, "Append a clip specified in absolute filename argument."}, {"PLAY", miracle_play, 1, ATYPE_NONE, "Play a loaded clip at speed -2000 to 2000 where 1000 = normal forward speed."}, @@ -184,7 +191,7 @@ static command_t vocabulary[] = {"SIN", miracle_set_in_point, 1, ATYPE_INT, "Set the IN point of the loaded clip to frame number argument. -1 = reset in point to 0"}, {"SOUT", miracle_set_out_point, 1, ATYPE_INT, "Set the OUT point of the loaded clip to frame number argument. -1 = reset out point to maximum."}, {"USTA", miracle_get_unit_status, 1, ATYPE_NONE, "Report information about the unit."}, - {"USET", miracle_set_unit_property, 1, ATYPE_STRING, "Set a unit configuration property."}, + {"USET", miracle_set_unit_property, 1, ATYPE_PAIR, "Set a unit configuration property."}, {"UGET", miracle_get_unit_property, 1, ATYPE_STRING, "Get a unit configuration property."}, {"XFER", miracle_transfer, 1, ATYPE_STRING, "Transfer the unit's clip to another unit specified as argument."}, {"SHUTDOWN", miracle_shutdown, 0, ATYPE_NONE, "Shutdown the server."}, @@ -286,6 +293,35 @@ void signal_handler( int sig ) } } +static void sigsegv_handler() +{ +#ifdef linux + void *array[ 10 ]; + size_t size; + char **strings; + size_t i; + + miracle_log( LOG_CRIT, "\a\nMiracle experienced a segmentation fault.\n" + "Dumping stack from the offending thread\n\n" ); + size = backtrace( array, 10 ); + strings = backtrace_symbols( array, size ); + + miracle_log( LOG_CRIT, "Obtained %zd stack frames.\n", size ); + + for ( i = 0; i < size; i++ ) + miracle_log( LOG_CRIT, "%s", strings[ i ] ); + + free( strings ); + + miracle_log( LOG_CRIT, "\nDone dumping - exiting.\n" ); +#else + miracle_log( LOG_CRIT, "\a\nMiracle experienced a segmentation fault.\n" ); +#endif + exit( EXIT_FAILURE ); +} + + + /** Local 'connect' function. */ @@ -304,6 +340,8 @@ static valerie_response miracle_local_connect( miracle_local local ) signal( SIGPIPE, signal_handler ); signal( SIGALRM, signal_handler ); signal( SIGCHLD, SIG_IGN ); + if ( getenv( "MLT_SIGSEGV" ) ) + signal( SIGSEGV, sigsegv_handler ); return response; } @@ -331,7 +369,7 @@ int miracle_command_parse_unit( command_argument cmd, int argument ) /** Parse a normal argument. */ -void *miracle_command_parse_argument( command_argument cmd, int argument, arguments_types type ) +void *miracle_command_parse_argument( command_argument cmd, int argument, arguments_types type, char *command ) { void *ret = NULL; char *value = valerie_tokeniser_get_string( cmd->tokeniser, argument ); @@ -353,6 +391,19 @@ void *miracle_command_parse_argument( command_argument cmd, int argument, argume ret = strdup( value ); break; + case ATYPE_PAIR: + if ( strchr( command, '=' ) ) + { + char *ptr = strchr( command, '=' ); + while ( *( ptr - 1 ) != ' ' ) + ptr --; + ret = strdup( ptr ); + ptr = ret; + while( ptr[ strlen( ptr ) - 1 ] == ' ' ) + ptr[ strlen( ptr ) - 1 ] = '\0'; + } + break; + case ATYPE_INT: ret = malloc( sizeof( int ) ); if ( ret != NULL ) @@ -425,7 +476,7 @@ static valerie_response miracle_local_execute( miracle_local local, char *comman if ( miracle_command_get_error( &cmd ) == RESPONSE_SUCCESS ) { - cmd.argument = miracle_command_parse_argument( &cmd, position, vocabulary[ index ].type ); + cmd.argument = miracle_command_parse_argument( &cmd, position, vocabulary[ index ].type, command ); if ( cmd.argument == NULL && vocabulary[ index ].type != ATYPE_NONE ) miracle_command_set_error( &cmd, RESPONSE_MISSING_ARG ); position ++; @@ -452,8 +503,10 @@ static valerie_response miracle_local_execute( miracle_local local, char *comman static void miracle_local_close( miracle_local local ) { miracle_delete_all_units(); - pthread_kill_other_threads_np(); +#ifdef linux + //pthread_kill_other_threads_np(); miracle_log( LOG_DEBUG, "Clean shutdown." ); free( local ); - //mlt_factory_close( ); + mlt_factory_close( ); +#endif }