Changeset 5010:065b9de0acf7 in roaraudio for include

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Updated roar_reset() (Closes: #131)

Location:

include/libroar

Files:

• config.h (modified) (1 diff)
• libroar.h (modified) (1 diff)
• memmgr.h (modified) (2 diffs)
• roarfeatures.h (modified) (1 diff)

include/libroar/config.h

@@ -109 +109 @@
 struct roar_libroar_config * roar_libroar_get_config(void);
 
+int    roar_libroar_reset_config(void);
+
 int    roar_libroar_config_parse(char * txt, char * delm);
 

include/libroar/libroar.h

@@ -201 +201 @@
 
 // call this function after we fork/exec()ed or similar.
-int roar_reset(int forked);
+enum roar_reset {
+ ROAR_RESET_UNKNOWN     = -1,
+#define ROAR_RESET_UNKNOWN ROAR_RESET_UNKNOWN
+ ROAR_RESET_NONE        =  0,
+#define ROAR_RESET_NONE ROAR_RESET_NONE
+ ROAR_RESET_ON_FORK     =  1,
+#define ROAR_RESET_ON_FORK ROAR_RESET_ON_FORK
+ ROAR_RESET_ON_EXIT     =  2,
+#define ROAR_RESET_ON_EXIT ROAR_RESET_ON_EXIT
+ ROAR_RESET_ON_PRE_EXEC =  3,
+#define ROAR_RESET_ON_PRE_EXEC ROAR_RESET_ON_PRE_EXEC
+ ROAR_RESET_MEMORY      =  0x81,
+#define ROAR_RESET_MEMORY ROAR_RESET_MEMORY
+ ROAR_RESET_CONFIG      =  0x82,
+#define ROAR_RESET_CONFIG ROAR_RESET_CONFIG
+ ROAR_RESET_RANDOMPOOL  =  0x84,
+#define ROAR_RESET_RANDOMPOOL ROAR_RESET_RANDOMPOOL
+ ROAR_RESET_EOL         = -2
+#define ROAR_RESET_EOL ROAR_RESET_EOL
+};
+int roar_reset(enum roar_reset what);
 
 // fatal probelms:

include/libroar/memmgr.h

@@ -48 +48 @@
 // those functions are currently not implemeted:
 
+int     roar_mm_reset(void);
+
 ssize_t roar_mm_sizeof(void * buf);
 
@@ -61 +63 @@
 
 #else
+#define roar_mm_reset()             (0)
 #define roar_mm_sizeof(ptr)         ((ssize_t)-1)
 #define roar_mm_calloc(nmemb, size) calloc((nmemb), (size))

include/libroar/roarfeatures.h

@@ -47 +47 @@
 #define ROAR_FT_FUNC_SIMPLE_CONNECT2
 #define ROAR_FT_FUNC_PANIC
+#define ROAR_FT_FUNC_RESET
 #define ROAR_FT_FEATURE_VS
 #define ROAR_FT_FEATURE_VS_FILE