Changeset 5503:15152f742401 in roaraudio

Timestamp:

05/15/12 13:42:06 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

disallow running appsched's _init() and _free() multiple or other members in wrong order

File:

• libroar/roardl.c (modified) (6 diffs)

libroar/roardl.c

@@ -44 +44 @@
 #endif
 
+#define RTF_RA_INITED       0x0001
+#define RTF_APPSCHED_INITED 0x0002
+#define RTF_APPSCHED_FREED  0x0004
+
 struct roar_dl_lhandle {
  size_t refc; // currently unused.
@@ -56 +60 @@
   struct roar_notify_core * notifycore;
  } context;
- int ra_inited;
+ unsigned int runtime_flags;
 #if defined(ROAR_HAVE_LIBDL)
  void * handle;
@@ -536 +540 @@
    return -1;
  } else {
-  if ( lhandle->ra_inited )
+  if ( lhandle->runtime_flags & RTF_RA_INITED )
    return 0;
 
@@ -634 +638 @@
 
  if ( !((void*)lhandle < (void*)128) )
-  lhandle->ra_inited = 1;
+  lhandle->runtime_flags |= RTF_RA_INITED;
 
  return 0;
@@ -796 +800 @@
 
  if ( func == NULL ) {
+  if ( trigger == ROAR_DL_APPSCHED_INIT ) {
+   lhandle->runtime_flags |= RTF_APPSCHED_INITED|RTF_APPSCHED_FREED;
+   lhandle->runtime_flags -= RTF_APPSCHED_FREED;
+  } else if ( trigger == ROAR_DL_APPSCHED_FREE ) {
+   lhandle->runtime_flags |= RTF_APPSCHED_INITED|RTF_APPSCHED_FREED;
+   lhandle->runtime_flags -= RTF_APPSCHED_INITED;
+  }
   roar_err_set(ROAR_ERROR_NOENT);
   return -1;
+ }
+
+ if ( trigger == ROAR_DL_APPSCHED_INIT ) {
+  if ( lhandle->runtime_flags & RTF_APPSCHED_INITED ) {
+   roar_err_set(ROAR_ERROR_BUSY);
+   return -1;
+  }
+ } else {
+  if ( !(lhandle->runtime_flags & RTF_APPSCHED_INITED) ) {
+   roar_err_set(ROAR_ERROR_BUSY);
+   return -1;
+  }
  }
 
@@ -803 +826 @@
  ret = func(lhandle->para);
  roar_dl_context_store(lhandle);
+
+ if ( trigger == ROAR_DL_APPSCHED_INIT ) {
+  lhandle->runtime_flags |= RTF_APPSCHED_INITED|RTF_APPSCHED_FREED;
+  lhandle->runtime_flags -= RTF_APPSCHED_FREED;
+ } else if ( trigger == ROAR_DL_APPSCHED_FREE ) {
+  lhandle->runtime_flags |= RTF_APPSCHED_INITED|RTF_APPSCHED_FREED;
+  lhandle->runtime_flags -= RTF_APPSCHED_INITED;
+ }
+
  return ret;
 }