X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_server.c;h=d0a96b93a6de1f63b42122895f9095d6f1e53710;hb=64f9aa2d35148116826be20b153a4231e6829243;hp=1ea982fd8ef0e6a961c39332134d48872a7cb4ee;hpb=ebcbb3571620a43fe24b3f8fa0161096ef628dbe;p=melted diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c index 1ea982f..d0a96b9 100644 --- a/src/miracle/miracle_server.c +++ b/src/miracle/miracle_server.c @@ -41,6 +41,7 @@ #include "miracle_connection.h" #include "miracle_local.h" #include "miracle_log.h" +#include "miracle_commands.h" #include #include @@ -157,9 +158,6 @@ static void *miracle_server_run( void *arg ) their resources get freed automatically. (CY: ... hmmph...) */ pthread_attr_init( &thread_attributes ); pthread_attr_setdetachstate( &thread_attributes, PTHREAD_CREATE_DETACHED ); - pthread_attr_init( &thread_attributes ); - pthread_attr_setinheritsched( &thread_attributes, PTHREAD_INHERIT_SCHED ); - /* pthread_attr_setschedpolicy( &thread_attributes, SCHED_RR ); */ while ( !server->shutdown ) { @@ -266,25 +264,13 @@ int miracle_server_execute( miracle_server server ) if ( response != NULL ) { - pthread_attr_t attr; int result; - pthread_attr_init( &attr ); - pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); - pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); - pthread_attr_setschedpolicy( &attr, SCHED_FIFO ); - pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); valerie_response_close( response ); - result = pthread_create( &server->thread, &attr, miracle_server_run, server ); + result = pthread_create( &server->thread, NULL, miracle_server_run, server ); if ( result ) { - miracle_log( LOG_WARNING, "Failed to schedule realtime (%s)", strerror(errno) ); - pthread_attr_setschedpolicy( &attr, SCHED_OTHER ); - result = pthread_create( &server->thread, &attr, miracle_server_run, server ); - if ( result ) - { - miracle_log( LOG_CRIT, "Failed to launch TCP listener thread" ); - error = -1; - } + miracle_log( LOG_CRIT, "Failed to launch TCP listener thread" ); + error = -1; } } } @@ -298,6 +284,15 @@ int miracle_server_execute( miracle_server server ) return error; } +/** Fetch a units properties +*/ + +mlt_properties miracle_server_fetch_unit( miracle_server server, int index ) +{ + miracle_unit unit = miracle_get_unit( index ); + return unit != NULL ? unit->properties : NULL; +} + /** Shutdown the server. */