Changeset 5 for pjproject/main/pjlib/src/pj/os_core_win32.c

Timestamp:

Nov 1, 2005 9:46:17 PM (18 years ago)

Author:

bennylp

Message:

Changed atomic interface and fixed bugs in echo test client

File:

• pjproject/main/pjlib/src/pj/os_core_win32.c (modified) (4 diffs)

pjproject/main/pjlib/src/pj/os_core_win32.c

@@ -496 +496 @@
  * pj_atomic_set()
  */
-PJ_DEF(long) pj_atomic_set(pj_atomic_t *atomic_var, long value)
+PJ_DEF(void) pj_atomic_set( pj_atomic_t *atomic_var, pj_atomic_value_t value)
+{
+    PJ_CHECK_STACK();
+
+    InterlockedExchange(&atomic_var->value, value);
+}
+
+/*
+ * pj_atomic_get()
+ */
+PJ_DEF(pj_atomic_value_t) pj_atomic_get(pj_atomic_t *atomic_var)
 {
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(atomic_var, 0);
 
-    return InterlockedExchange(&atomic_var->value, value);
-}
-
-/*
- * pj_atomic_get()
- */
-PJ_DEF(long) pj_atomic_get(pj_atomic_t *atomic_var)
-{
-    PJ_CHECK_STACK();
-    PJ_ASSERT_RETURN(atomic_var, 0);
-
     return atomic_var->value;
 }
@@ -518 +517 @@
  * pj_atomic_inc()
  */
-PJ_DEF(long) pj_atomic_inc(pj_atomic_t *atomic_var)
-{
-    PJ_CHECK_STACK();
-    PJ_ASSERT_RETURN(atomic_var, 0);
+PJ_DEF(void) pj_atomic_inc(pj_atomic_t *atomic_var)
+{
+    PJ_CHECK_STACK();
 
 #if defined(PJ_WIN32_WINNT) && PJ_WIN32_WINNT >= 0x0400
-    return InterlockedIncrement(&atomic_var->value);
+    InterlockedIncrement(&atomic_var->value);
 #else
 #   error Fix Me
@@ -533 +531 @@
  * pj_atomic_dec()
  */
-PJ_DEF(long) pj_atomic_dec(pj_atomic_t *atomic_var)
-{
-    PJ_CHECK_STACK();
-    PJ_ASSERT_RETURN(atomic_var, 0);
+PJ_DEF(void) pj_atomic_dec(pj_atomic_t *atomic_var)
+{
+    PJ_CHECK_STACK();
 
 #if defined(PJ_WIN32_WINNT) && PJ_WIN32_WINNT >= 0x0400
-    return InterlockedDecrement(&atomic_var->value);
+    InterlockedDecrement(&atomic_var->value);
 #else
 #   error Fix me
@@ -545 +542 @@
 }
 
-
+/*
+ * pj_atomic_add()
+ */
+PJ_DEF(void) pj_atomic_add( pj_atomic_t *atomic_var,
+                            pj_atomic_value_t value )
+{
+    InterlockedExchangeAdd( &atomic_var->value, value );
+}
+
+        
 ///////////////////////////////////////////////////////////////////////////////
 /*