X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_server.c;h=629da5583cae2882f936553ccec10658c804be95;hb=b1616107824f9c1b2e83c97d9a8d3b0cc700ef5f;hp=5ea3978b2124aeada76bac051588a2eb71e831fa;hpb=529670db145a8731d56a8fc5fc43b8aa480f7f1f;p=mlt

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 5ea3978b..629da558 100644
--- 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>
 
@@ -86,7 +87,12 @@ miracle_server miracle_server_init( char *id )
 	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 )
 	{
@@ -142,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 );
 
@@ -152,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 )
 	{
@@ -261,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;
 			}
 		}
 	}
@@ -293,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.
 */