Changeset 5846:21c98581c23b in roaraudio

Timestamp:

01/07/13 13:41:10 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid possible problems with roar_env_get_home() outsite init phase. should also speed up roar_libroar_get_config_ptr() slightly

Location:

libroar

Files:

• basic.c (modified) (4 diffs)
• config.c (modified) (2 diffs)

libroar/basic.c

@@ -140 +140 @@
  if ( _spawnlp(MODE, daemonimage, daemonimage, "--tcp", "--bind", "localhost", "--port", buf, (const char*)NULL) < 0 ) {
   roar_err_update();
+  ret = roar_error;
   ROAR_ERR("_start_server_win32(server='%s', ...): Can not start server: %s: %s", server, daemonimage, roar_errorstring);
+  roar_error = ret;
+  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
+  roar_error = ret;
+  ROAR_ERR("DUMMY");
+  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
+  roar_error = ret;
+  (void)roar_errorstring;
+  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
   return -1;
  }
@@ -155 +164 @@
    roar_sleep(1);
  }
+
+ ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
 
  if ( ret == -1 )
@@ -236 +247 @@
 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);
+ int ret;
+ ret = _start_server_win32(con, server, type, flags, timeout);
+ ROAR_ERR("_start_server(*): %s", roar_errorstring);
+ return ret;
 #elif !defined(ROAR_TARGET_MICROCONTROLLER)
  return _start_server_posix(con, server, type, flags, timeout);
@@ -293 +307 @@
   return 0;
  } else if ( !strcmp(server, "+fork") || !strncmp(server, "+fork=", 6) ) {
-  return _start_server(con, server, type, flags, timeout);
+  ret = _start_server(con, server, type, flags, timeout);
+  ROAR_ERR("_connect_server(*): %s", roar_errorstring);
+  return ret;
  } else if ( !strcmp(server, "+internal") || !strncmp(server, "+internal=", 10) ) {
   ret = _connect_internal(con, server, type, flags, timeout);

libroar/config.c

@@ -46 +46 @@
  static int    inited = 0;
  static char   authfile[LEN_AUTHFILE];
- const  char * home = roar_env_get_home(0);
+ const  char * home;
 
  if ( !inited ) {
@@ -62 +62 @@
   config.protocolversion  = -1; // use default.
 
+  home = roar_env_get_home(0);
   if ( home != NULL ) {
    snprintf(authfile, sizeof(authfile)-1, "%s/.roarauth", home);