Changeset 5010:065b9de0acf7 in roaraudio for libroar

Timestamp:

05/26/11 09:26:00 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated roar_reset() (Closes: #131)

Location:

libroar

Files:

• config.c (modified) (1 diff)
• libroar.c (modified) (1 diff)
• memmgr.c (modified) (1 diff)

libroar/config.c

@@ -84 +84 @@
 
  return config;
+}
+
+int    roar_libroar_reset_config(void) {
+ struct roar_libroar_config * config = roar_libroar_get_config_ptr();
+
+ if ( config->codecs.codec != NULL ) {
+  roar_mm_free(config->codecs.codec);
+  config->codecs.num = 0;
+ }
+
+ return 0;
 }
 

libroar/libroar.c

@@ -146 +146 @@
 }
 
-int roar_reset(int forked) {
+int roar_reset(enum roar_reset what) {
  char c;
  int i;
+ enum roar_reset subsets = ROAR_RESET_NONE;
 
  roar_err_set(ROAR_ERROR_NONE);
 
- for (i = 0; i < 16; i++) {
-  roar_random_gen_nonce(&c, 1);
-  roar_random_uint16();
-  roar_random_uint32();
- }
-
+ switch (what) {
+  case ROAR_RESET_NONE:
+    return 0;
+   break;
+  case ROAR_RESET_UNKNOWN:
+  case ROAR_RESET_EOL:
+    roar_err_set(ROAR_ERROR_INVAL);
+    return -1;
+   break;
+  case ROAR_RESET_ON_FORK:
+    subsets |= ROAR_RESET_MEMORY|ROAR_RESET_RANDOMPOOL;
+   break;
+  case ROAR_RESET_ON_EXIT:
+  case ROAR_RESET_ON_PRE_EXEC:
+    subsets |= ROAR_RESET_MEMORY|ROAR_RESET_CONFIG;
+   break;
+  default:
+    if ( what & 0x80 ) {
+     subsets |= what;
+    } else {
+     roar_err_set(ROAR_ERROR_INVAL);
+     return -1;
+    }
+   break;
+ }
+
+ // strip 0x80 so we can easly test on the other bit per subsystem.
+ what |= 0x80;
+ what -= 0x80;
+
+ if ( what & ROAR_RESET_MEMORY ) {
+  roar_mm_reset();
+ }
+
+ if ( what & ROAR_RESET_CONFIG ) {
+  roar_libroar_reset_config();
+ }
+
+ if ( what & ROAR_RESET_RANDOMPOOL ) {
+  for (i = 0; i < 16; i++) {
+   roar_random_gen_nonce(&c, 1);
+   roar_random_uint16();
+   roar_random_uint32();
+  }
+ }
+
+ roar_err_set(ROAR_ERROR_NONE);
  return 0;
 }

libroar/memmgr.c

@@ -50 +50 @@
 
 #ifdef ROAR_USE_MEMMGR
+
+int     roar_mm_reset(void) {
+ // currently this does nothing.
+ // we need to free pools and such here later.
+ return 0;
+}
+
 ssize_t roar_mm_sizeof(void * buf) {
  if ( buf == NULL ) {