Changeset 5373:8da157c10483 in roaraudio for libroar/libroar.c

Timestamp:

12/21/11 19:02:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Updated config structure
• Added a flag to ask libroar to only connect to local servers
• Added a way to override fork()
• added support for +internal

File:

• libroar/libroar.c (modified) (1 diff)

libroar/libroar.c

@@ -154 +154 @@
 }
 
+static pid_t _libroar_fork(void ** context, void * userdata) {
+ pid_t ret;
+ (void)context, (void)userdata;
+ ret = fork();
+ if ( ret == -1 )
+  roar_err_from_errno();
+ return ret;
+}
+
+static const struct roar_libroar_forkapi _libroar_forkapi = {
+ .prefork   = NULL,
+ .fork      = _libroar_fork,
+ .failed    = NULL,
+ .parent    = NULL,
+ .child     = NULL,
+ .userdata  = NULL
+};
+
+pid_t roar_fork(const struct roar_libroar_forkapi * api) {
+ void * context = NULL;
+ int err;
+ pid_t ret;
+
+ if ( api == NULL )
+  api = &_libroar_forkapi;
+
+ if ( api->fork == NULL ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( api->prefork != NULL ) {
+  if ( api->prefork(&context, api->userdata) != 0 ) {
+   if ( api->failed != NULL )
+    api->failed(&context, api->userdata);
+
+   if ( context != NULL ) {
+    err = roar_error;
+    roar_mm_free(context);
+    roar_error = err;
+   }
+   return (pid_t)-1;
+  }
+ }
+
+ if ( (ret = api->fork(&context, api->userdata)) == (pid_t)-1 ) {
+  if ( api->failed != NULL )
+   api->failed(&context, api->userdata);
+
+  if ( context != NULL ) {
+   err = roar_error;
+   roar_mm_free(context);
+   roar_error = err;
+  }
+  return (pid_t)-1;
+ }
+
+ if ( ret == (pid_t)0 ) {
+  if ( api->child != NULL )
+   api->child(&context, api->userdata);
+ } else {
+  if ( api->parent != NULL )
+   api->parent(&context, api->userdata, ret);
+ }
+
+ if ( context != NULL ) {
+  err = roar_error;
+  roar_mm_free(context);
+  roar_error = err;
+ }
+
+ return ret;
+}
+
 int roar_reset(enum roar_reset what) {
  char c;