X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_server.c;h=a746c8bd033dcba0453ddad13c67c7106733521d;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=d4f886b9b2cd65d06ed95276b928e3c3527cf098;hpb=661165812e3410fe2f6f49d7af882b36a0efcf82;p=melted diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c index d4f886b..a746c8b 100644 --- a/src/miracle/miracle_server.c +++ b/src/miracle/miracle_server.c @@ -1,5 +1,5 @@ /* - * dvserver.c -- DV Server + * miracle_server.c * Copyright (C) 2002-2003 Ushodaya Enterprises Limited * Author: Charles Yates * @@ -18,10 +18,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include -#endif - /* System header files */ #include #include @@ -36,59 +32,99 @@ #include #include -#include "log.h" #include #include #include /* Application header files */ -#include "dvserver.h" -#include "dvconnection.h" -#include "dvlocal.h" -#include "log.h" -#include -#include +#include "miracle_server.h" +#include "miracle_connection.h" +#include "miracle_local.h" +#include "miracle_log.h" +#include "miracle_commands.h" +#include +#include + +#define VERSION "0.0.1" + +static void miracle_command_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ] ); +} + +static void miracle_doc_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ], ( char * )args[ 2 ] ); +} + +static void miracle_push_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args ) +{ + if ( listener != NULL ) + listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ], ( mlt_service )args[ 2 ] ); +} /** Initialise a server structure. */ -dv_server dv_server_init( char *id ) +miracle_server miracle_server_init( char *id ) { - dv_server server = malloc( sizeof( dv_server_t ) ); + miracle_server server = malloc( sizeof( miracle_server_t ) ); if ( server != NULL ) + memset( server, 0, sizeof( miracle_server_t ) ); + if ( server != NULL && mlt_properties_init( &server->parent, server ) == 0 ) { - memset( server, 0, sizeof( dv_server_t ) ); server->id = id; server->port = DEFAULT_TCP_PORT; server->socket = -1; + server->shutdown = 1; + mlt_events_init( &server->parent ); + mlt_events_register( &server->parent, "command-received", ( mlt_transmitter )miracle_command_received ); + mlt_events_register( &server->parent, "doc-received", ( mlt_transmitter )miracle_doc_received ); + mlt_events_register( &server->parent, "push-received", ( mlt_transmitter )miracle_push_received ); } return server; } +const char *miracle_server_id( miracle_server server ) +{ + return server != NULL && server->id != NULL ? server->id : "miracle"; +} + +void miracle_server_set_config( miracle_server server, char *config ) +{ + if ( server != NULL ) + { + free( server->config ); + server->config = config != NULL ? strdup( config ) : NULL; + } +} + /** Set the port of the server. */ -void dv_server_set_port( dv_server server, int port ) +void miracle_server_set_port( miracle_server server, int port ) { server->port = port; } -void dv_server_set_proxy( dv_server server, char *proxy ) +void miracle_server_set_proxy( miracle_server server, char *proxy ) { - dv_tokeniser tokeniser = dv_tokeniser_init( ); + valerie_tokeniser tokeniser = valerie_tokeniser_init( ); server->proxy = 1; server->remote_port = DEFAULT_TCP_PORT; - dv_tokeniser_parse_new( tokeniser, proxy, ":" ); - strcpy( server->remote_server, dv_tokeniser_get_string( tokeniser, 0 ) ); - if ( dv_tokeniser_count( tokeniser ) == 2 ) - server->remote_port = atoi( dv_tokeniser_get_string( tokeniser, 1 ) ); - dv_tokeniser_close( tokeniser ); + valerie_tokeniser_parse_new( tokeniser, proxy, ":" ); + strcpy( server->remote_server, valerie_tokeniser_get_string( tokeniser, 0 ) ); + if ( valerie_tokeniser_count( tokeniser ) == 2 ) + server->remote_port = atoi( valerie_tokeniser_get_string( tokeniser, 1 ) ); + valerie_tokeniser_close( tokeniser ); } /** Wait for a connection. */ -static int dv_server_wait_for_connect( dv_server server ) +static int miracle_server_wait_for_connect( miracle_server server ) { struct timeval tv; fd_set rfds; @@ -106,9 +142,9 @@ static int dv_server_wait_for_connect( dv_server server ) /** Run the server thread. */ -static void *dv_server_run( void *arg ) +static void *miracle_server_run( void *arg ) { - dv_server server = arg; + miracle_server server = arg; pthread_t cmd_parse_info; connection_t *tmp = NULL; pthread_attr_t thread_attributes; @@ -116,25 +152,23 @@ static void *dv_server_run( void *arg ) socksize = sizeof( struct sockaddr ); - dv1394d_log( LOG_NOTICE, "%s version %s listening on port %i", server->id, VERSION, server->port ); + miracle_log( LOG_NOTICE, "%s version %s listening on port %i", server->id, VERSION, server->port ); /* Create the initial thread. We want all threads to be created detached so 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 ) { /* Wait for a new connection. */ - if ( dv_server_wait_for_connect( server ) ) + if ( miracle_server_wait_for_connect( server ) ) { /* Create a new block of data to hold a copy of the incoming connection for our server thread. The thread should free this when it terminates. */ tmp = (connection_t*) malloc( sizeof(connection_t) ); + tmp->owner = &server->parent; tmp->parser = server->parser; tmp->fd = accept( server->socket, (struct sockaddr*) &(tmp->sin), &socksize ); @@ -144,7 +178,7 @@ static void *dv_server_run( void *arg ) } } - dv1394d_log( LOG_NOTICE, "%s version %s server terminated.", server->id, VERSION ); + miracle_log( LOG_NOTICE, "%s version %s server terminated.", server->id, VERSION ); return NULL; } @@ -152,14 +186,16 @@ static void *dv_server_run( void *arg ) /** Execute the server thread. */ -int dv_server_execute( dv_server server ) +int miracle_server_execute( miracle_server server ) { int error = 0; - dv_response response = NULL; + valerie_response response = NULL; int index = 0; struct sockaddr_in ServerAddr; int flag = 1; + server->shutdown = 0; + ServerAddr.sin_family = AF_INET; ServerAddr.sin_port = htons( server->port ); ServerAddr.sin_addr.s_addr = INADDR_ANY; @@ -172,7 +208,7 @@ int dv_server_execute( dv_server server ) { server->shutdown = 1; perror( "socket" ); - dv1394d_log( LOG_ERR, "%s unable to create socket.", server->id ); + miracle_log( LOG_ERR, "%s unable to create socket.", server->id ); return -1; } @@ -182,7 +218,7 @@ int dv_server_execute( dv_server server ) { server->shutdown = 1; perror( "bind" ); - dv1394d_log( LOG_ERR, "%s unable to bind to port %d.", server->id, server->port ); + miracle_log( LOG_ERR, "%s unable to bind to port %d.", server->id, server->port ); return -1; } @@ -190,7 +226,7 @@ int dv_server_execute( dv_server server ) { server->shutdown = 1; perror( "listen" ); - dv1394d_log( LOG_ERR, "%s unable to listen on port %d.", server->id, server->port ); + miracle_log( LOG_ERR, "%s unable to listen on port %d.", server->id, server->port ); return -1; } @@ -198,61 +234,49 @@ int dv_server_execute( dv_server server ) if ( !server->proxy ) { - dv1394d_log( LOG_NOTICE, "Starting server on %d.", server->port ); - server->parser = dv_parser_init_local( ); + miracle_log( LOG_NOTICE, "Starting server on %d.", server->port ); + server->parser = miracle_parser_init_local( ); } else { - dv1394d_log( LOG_NOTICE, "Starting proxy for %s:%d on %d.", server->remote_server, server->remote_port, server->port ); - server->parser = dv_parser_init_remote( server->remote_server, server->remote_port ); + miracle_log( LOG_NOTICE, "Starting proxy for %s:%d on %d.", server->remote_server, server->remote_port, server->port ); + server->parser = valerie_parser_init_remote( server->remote_server, server->remote_port ); } - response = dv_parser_connect( server->parser ); + response = valerie_parser_connect( server->parser ); - if ( response != NULL && dv_response_get_error_code( response ) == 100 ) + if ( response != NULL && valerie_response_get_error_code( response ) == 100 ) { /* read configuration file */ - if ( response != NULL && !server->proxy ) + if ( response != NULL && !server->proxy && server->config != NULL ) { - dv_response_close( response ); - response = dv_parser_run( server->parser, "/etc/dv1394d.conf" ); + valerie_response_close( response ); + response = valerie_parser_run( server->parser, server->config ); - if ( dv_response_count( response ) > 1 ) + if ( valerie_response_count( response ) > 1 ) { - if ( dv_response_get_error_code( response ) > 299 ) - dv1394d_log( LOG_ERR, "Error evaluating server configuration. Processing stopped." ); - for ( index = 0; index < dv_response_count( response ); index ++ ) - dv1394d_log( LOG_DEBUG, "%4d: %s", index, dv_response_get_line( response, index ) ); + if ( valerie_response_get_error_code( response ) > 299 ) + miracle_log( LOG_ERR, "Error evaluating server configuration. Processing stopped." ); + for ( index = 0; index < valerie_response_count( response ); index ++ ) + miracle_log( LOG_DEBUG, "%4d: %s", index, valerie_response_get_line( response, index ) ); } } 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 ); - dv_response_close( response ); - result = pthread_create( &server->thread, &attr, dv_server_run, server ); + valerie_response_close( response ); + result = pthread_create( &server->thread, NULL, miracle_server_run, server ); if ( result ) { - dv1394d_log( LOG_WARNING, "Failed to schedule realtime (%s)", strerror(errno) ); - pthread_attr_setschedpolicy( &attr, SCHED_OTHER ); - result = pthread_create( &server->thread, &attr, dv_server_run, server ); - if ( result ) - { - dv1394d_log( LOG_CRIT, "Failed to launch TCP listener thread" ); - error = -1; - } + miracle_log( LOG_CRIT, "Failed to launch TCP listener thread" ); + error = -1; } } } else { - dv1394d_log( LOG_ERR, "Error connecting to parser. Processing stopped." ); + miracle_log( LOG_ERR, "Error connecting to parser. Processing stopped." ); server->shutdown = 1; error = -1; } @@ -260,16 +284,40 @@ int dv_server_execute( dv_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. */ -void dv_server_shutdown( dv_server server ) +void miracle_server_shutdown( miracle_server server ) { if ( server != NULL && !server->shutdown ) { server->shutdown = 1; pthread_join( server->thread, NULL ); - dv_parser_close( server->parser ); + miracle_server_set_config( server, NULL ); + valerie_parser_close( server->parser ); + server->parser = NULL; close( server->socket ); } } + +/** Close the server. +*/ + +void miracle_server_close( miracle_server server ) +{ + if ( server != NULL && mlt_properties_dec_ref( &server->parent ) <= 0 ) + { + mlt_properties_close( &server->parent ); + miracle_server_shutdown( server ); + free( server ); + } +}