Merge mlt++/CUSTOMISING into docs/melted++.

[melted] / src / miracle / miracle_server.c

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 6d733de..629da55 100644 (file)
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -1,5 +1,5 @@
 /*
- * miracle_server.c -- DV Server
+ * miracle_server.c
  * Copyright (C) 2002-2003 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
@@ -41,6 +41,7 @@
 #include "miracle_connection.h"
 #include "miracle_local.h"
 #include "miracle_log.h"
+#include "miracle_commands.h"
 #include <valerie/valerie_remote.h>
 #include <valerie/valerie_tokeniser.h>
 
@@ -52,6 +53,12 @@ static void miracle_command_received( mlt_listener listener, mlt_properties owne
                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 )
@@ -71,14 +78,21 @@ miracle_server miracle_server_init( char *id )
                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;
 }
 
-void miracle_server_set_config( miracle_server server, char *config )
+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, const char *config )
 {
        if ( server != NULL )
        {
@@ -134,7 +148,7 @@ static void *miracle_server_run( void *arg )
        pthread_t cmd_parse_info;
        connection_t *tmp = NULL;
        pthread_attr_t thread_attributes;
-       int socksize;
+       socklen_t socksize;
 
        socksize = sizeof( struct sockaddr );
 
@@ -144,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 )
        {
@@ -183,6 +194,8 @@ int miracle_server_execute( miracle_server server )
        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;
@@ -251,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;
                        }
                }
        }
@@ -283,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.
 */