Changeset 5843:62465e3791bc in roaraudio

Timestamp:

01/07/13 05:43:06 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for +fork on win32 (Closes: #337)

Files:

• ChangeLog (modified) (1 diff)
• libroar/basic.c (modified) (4 diffs)

ChangeLog

@@ -10 +10 @@
           ABOUT, HELP and PREFERENCES.
         * Avoid %llX on win32 (Closes: #271)
+        * Added support for +fork on win32 (Closes: #337)
 
 v. 1.0beta8 - Mon Dec 10 2012 12:42 CET

libroar/basic.c

@@ -36 +36 @@
 #include "libroar.h"
 
-static int _start_server(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
-#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER)
- enum {
-  NORMAL = 0,
-  SYSTEM = 1
- } mode = NORMAL;
+enum mode {
+ NORMAL = 0,
+ SYSTEM = 1
+};
+
+static int _connect_server(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout);
+
+int __get_daemonimage(const char ** daemonimage, enum mode * mode, const char * server) {
+ *daemonimage = NULL;
+ *mode = NORMAL;
+
+ if ( !!strncmp(server, "+fork", 5) ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ server += 5;
+
+ if ( server[0] == '=' ) {
+  server++;
+
+  if ( server[0] == 0 ) {
+   // no special case, we just ignore it.
+  } else if ( server[0] == 'd' && server[1] == ':' ) {
+   server += 2;
+   *daemonimage = server;
+   *mode = NORMAL;
+  } else if ( server[0] == '!' ) {
+   server += 1;
+   *daemonimage = server;
+   *mode = SYSTEM;
+  } else {
+   roar_err_set(ROAR_ERROR_ILLSEQ);
+   return -1;
+  }
+ }
+
+ if ( *daemonimage == NULL )
+  *daemonimage = roar_libroar_get_config()->daemonimage;
+
+ // we keep this step to be compatible with older versions.
+ if ( *daemonimage == NULL || **daemonimage == 0 ) {
+  *daemonimage = roar_env_get("ROAR_DAEMONIMAGE");
+  if ( *daemonimage != NULL ) {
+   ROAR_WARN("__get_daemonimage(*): Usage of $ROAR_DAEMONIMAGE is obsolete. Use ROAR_OPTIONS=daemonimage:...");
+  }
+ }
+
+ if ( *daemonimage == NULL || **daemonimage == 0 )
+  *daemonimage = roar_libroar_get_path_static("bin-default-daemonimage");
+
+ return 0;
+}
+
+#if defined(ROAR_TARGET_WIN32)
+#define NUM_TRIES 16
+static int _start_server_win32(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
+ enum mode mode = NORMAL;
+ const char * daemonimage = NULL;
+ char buf[64];
+ int port;
+ size_t i;
+ int fh;
+ int ret;
+
+ if ( __get_daemonimage(&daemonimage, &mode, server) == -1 )
+  return -1;
+
+ if ( mode != NORMAL ) {
+  roar_err_set(ROAR_ERROR_NOSYS);
+  return -1;
+ }
+
+ for (i = 0; i < NUM_TRIES; i++) {
+  port = roar_random_uint16();
+  if ( port < 1 )
+   continue;
+
+  fh = roar_socket_connect(ROAR_SOCKET_TYPE_TCP, "localhost", port);
+  if ( fh == -1 )
+   break;
+
+  closesocket(fh);
+ }
+
+ if ( i == NUM_TRIES ) {
+  roar_err_set(ROAR_ERROR_LOOP);
+  return -1;
+ }
+
+ // port is the port to use. It seems to be 'free'.
+
+#if defined(_P_DETACH)
+#define MODE _P_DETACH
+#elif defined(_P_NOWAIT)
+#define MODE _P_NOWAIT
+#else
+#define MODE _P_NOWAITO
+#endif
+
+ snprintf(buf, sizeof(buf), "%i", port);
+ // TODO: FIXME: check for error here:
+ _spawnlp(MODE, daemonimage, daemonimage, "--tcp", "--bind", "localhost", "--port", buf, (const char*)NULL);
+
+ snprintf(buf, sizeof(buf), "localhost:%i", port);
+
+ // give the daemon some time to come up:
+ roar_usleep(25000);
+
+ ret = -1;
+ for (i = 0; ret == -1 && i < NUM_TRIES; i++) {
+  ret = _connect_server(con, buf, type, flags, timeout);
+  if ( ret == -1 && i < NUM_TRIES )
+   roar_sleep(1);
+ }
+
+ if ( ret == -1 )
+  return -1;
+
+ con->flags |= ROAR_CON_FLAGS_TERMINATE;
+
+ return 0;
+}
+#elif !defined(ROAR_TARGET_MICROCONTROLLER)
+static int _start_server_posix(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
+ enum mode mode = NORMAL;
  const char * daemonimage = NULL;
  int socks[2];
@@ -48 +168 @@
  size_t len;
 
- if ( !strncmp(server, "+fork=", 6) ) {
-  server += 6;
-  if ( server[0] == 0 ) {
-   // no special case, we just ignore it.
-  } else if ( server[0] == 'd' && server[1] == ':' ) {
-   server += 2;
-   daemonimage = server;
-  } else if ( server[0] == '!' ) {
-   server += 1;
-   daemonimage = server;
-   mode = SYSTEM;
-  } else {
-   roar_err_set(ROAR_ERROR_ILLSEQ);
-   return -1;
-  }
- }
-
- if ( daemonimage == NULL )
-  daemonimage = roar_libroar_get_config()->daemonimage;
-
- // we keep this step to be compatible with older versions.
- if ( daemonimage == NULL || *daemonimage == 0 ) {
-  daemonimage = roar_env_get("ROAR_DAEMONIMAGE");
-  if ( daemonimage != NULL ) {
-   ROAR_WARN("_start_server(*): Usage of $ROAR_DAEMONIMAGE is obsolete. Use ROAR_OPTIONS=daemonimage:...");
-  }
- }
-
- if ( daemonimage == NULL || *daemonimage == 0 )
-  daemonimage = roar_libroar_get_path_static("bin-default-daemonimage");
+ if ( __get_daemonimage(&daemonimage, &mode, server) == -1 )
+  return -1;
 
  len = roar_mm_strlen(daemonimage) + 9; // 9 = '+fork=' + 'X:' + '\0'
@@ -135 +227 @@
 
  return -1;
+}
+#endif
+
+static int _start_server(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
+#if defined(ROAR_TARGET_WIN32)
+ return _start_server_win32(con, server, type, flags, timeout);
+#elif !defined(ROAR_TARGET_MICROCONTROLLER)
+ return _start_server_posix(con, server, type, flags, timeout);
 #else
- ROAR_ERR("_start_server(*): There is no UNIX Domain Socket support in win32, download a real OS.");
+ ROAR_ERR("_start_server(*): There is no UNIX Domain Socket, download a real OS.");
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
@@ -610 +711 @@
   if ( roar_terminate(con, 1) == -1 ) {
    ROAR_WARN("roar_connectionunref(con=%p{.server_name='%s'}): Can not terminate server as requested.", con, con->server_name);
+   if ( roar_terminate(con, 0) == -1 ) {
+    ROAR_ERR("roar_connectionunref(con=%p{.server_name='%s'}): Can not exit server. BAD.", con, con->server_name);
+   }
   }
  }