Use new atomic types in emulator

5 files changed, 42 insertions, 40 deletions

diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index c17806d96c..4d0ca97889 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -124,9 +124,9 @@
   erts_smp_mtx_unlock(&(PS)->mtx)
 
 #define ERTS_POLLSET_SET_POLLED_CHK(PS) \
-  ((int) erts_smp_atomic_xchg(&(PS)->polled, (long) 1))
+  ((int) erts_smp_atomic_xchg(&(PS)->polled, (erts_aint_t) 1))
 #define ERTS_POLLSET_UNSET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 0)
+  erts_smp_atomic_set(&(PS)->polled, (erts_aint_t) 0)
 #define ERTS_POLLSET_IS_POLLED(PS) \
   ((int) erts_smp_atomic_read(&(PS)->polled))
 
@@ -134,11 +134,11 @@
 #define ERTS_POLLSET_SET_POLLER_WOKEN(PS) 				\
 do {									\
       ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->woken, (long) 1);			\
+      erts_smp_atomic_set(&(PS)->woken, (erts_aint_t) 1);		\
 } while (0)
 #define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)				\
 do {									\
-    erts_smp_atomic_set(&(PS)->woken, (long) 0);			\
+    erts_smp_atomic_set(&(PS)->woken, (erts_aint_t) 0);			\
     ERTS_THR_MEMORY_BARRIER;						\
 } while (0)
 #define ERTS_POLLSET_IS_POLLER_WOKEN(PS)				\
@@ -179,9 +179,9 @@ do {									\
 
 #if ERTS_POLL_USE_UPDATE_REQUESTS_QUEUE
 #define ERTS_POLLSET_SET_HAVE_UPDATE_REQUESTS(PS) \
-  erts_smp_atomic_set(&(PS)->have_update_requests, (long) 1)
+  erts_smp_atomic_set(&(PS)->have_update_requests, (erts_aint_t) 1)
 #define ERTS_POLLSET_UNSET_HAVE_UPDATE_REQUESTS(PS) \
-  erts_smp_atomic_set(&(PS)->have_update_requests, (long) 0)
+  erts_smp_atomic_set(&(PS)->have_update_requests, (erts_aint_t) 0)
 #define ERTS_POLLSET_HAVE_UPDATE_REQUESTS(PS) \
   ((int) erts_smp_atomic_read(&(PS)->have_update_requests))
 #else
@@ -202,13 +202,13 @@ do {									\
 #define ERTS_POLLSET_UNSET_INTERRUPTED_CHK(PS) unset_interrupted_chk((PS))
 #define ERTS_POLLSET_UNSET_INTERRUPTED(PS)				\
 do {									\
-    erts_smp_atomic_set(&(PS)->interrupt, (long) 0);			\
+    erts_smp_atomic_set(&(PS)->interrupt, (erts_aint_t) 0);		\
     ERTS_THR_MEMORY_BARRIER;						\
 } while (0)
 #define ERTS_POLLSET_SET_INTERRUPTED(PS) 				\
 do {									\
       ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->interrupt, (long) 1);			\
+      erts_smp_atomic_set(&(PS)->interrupt, (erts_aint_t) 1);		\
 } while (0)
 #define ERTS_POLLSET_IS_INTERRUPTED(PS)					\
   ((int) erts_smp_atomic_read(&(PS)->interrupt))
@@ -356,7 +356,7 @@ unset_interrupted_chk(ErtsPollSet ps)
     res = ps->interrupt;
     ps->interrupt = 0;
 #else
-    res = (int) erts_smp_atomic_xchg(&ps->interrupt, (long) 0);
+    res = (int) erts_smp_atomic_xchg(&ps->interrupt, (erts_aint_t) 0);
     ERTS_THR_MEMORY_BARRIER;
 #endif
     return res;
@@ -369,7 +369,7 @@ static ERTS_INLINE int
 set_poller_woken_chk(ErtsPollSet ps)
 {
     ERTS_THR_MEMORY_BARRIER;
-    return (int) erts_smp_atomic_xchg(&ps->woken, (long) 1);
+    return (int) erts_smp_atomic_xchg(&ps->woken, (erts_aint_t) 1);
 }
 
 #endif
@@ -1918,7 +1918,7 @@ check_fd_events(ErtsPollSet ps, SysTimeval *tv, int max_res, int *ps_locked)
 	return 0;
     }
     else {
-	long timeout = tv->tv_sec*1000 + tv->tv_usec/1000;
+	erts_aint_t timeout = tv->tv_sec*1000 + tv->tv_usec/1000;
 	ASSERT(timeout >= 0);
 	erts_smp_atomic_set(&ps->timeout, timeout);
 #if ERTS_POLL_USE_FALLBACK
@@ -2112,7 +2112,7 @@ ERTS_POLL_EXPORT(erts_poll_wait)(ErtsPollSet ps,
 #endif
 
  done:
-    erts_smp_atomic_set(&ps->timeout, LONG_MAX);
+    erts_smp_atomic_set(&ps->timeout, ERTS_AINT_T_MAX);
 #ifdef ERTS_POLL_DEBUG_PRINT
     erts_printf("Leaving %s = erts_poll_wait()\n",
 		 res == 0 ? "0" : erl_errno_id(res));
@@ -2150,10 +2150,12 @@ ERTS_POLL_EXPORT(erts_poll_interrupt)(ErtsPollSet ps, int set)
  * is not guaranteed that it will timeout before 'msec' milli seconds.
  */
 void
-ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps, int set, long msec)
+ERTS_POLL_EXPORT(erts_poll_interrupt_timed)(ErtsPollSet ps,
+					    int set,
+					    long msec)
 {
     if (set) {
-	if (erts_smp_atomic_read(&ps->timeout) > msec) {
+	if (erts_smp_atomic_read(&ps->timeout) > (erts_aint_t) msec) {
 	    ERTS_POLLSET_SET_INTERRUPTED(ps);
 #if ERTS_POLL_ASYNC_INTERRUPT_SUPPORT || defined(ERTS_SMP)
 	    wake_poller(ps);
@@ -2315,7 +2317,7 @@ ERTS_POLL_EXPORT(erts_poll_create_pollset)(void)
 #else
     erts_smp_atomic_init(&ps->interrupt, 0);
 #endif
-    erts_smp_atomic_init(&ps->timeout, LONG_MAX);
+    erts_smp_atomic_init(&ps->timeout, ERTS_AINT_T_MAX);
 #ifdef ERTS_POLL_COUNT_AVOIDED_WAKEUPS
     erts_smp_atomic_init(&ps->no_avoided_wakeups, 0);
     erts_smp_atomic_init(&ps->no_avoided_interrupts, 0);
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 01ba773688..d021baa6bf 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -237,9 +237,9 @@ static int max_files = -1;
 #ifdef ERTS_SMP
 erts_smp_atomic_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 0)
 #else
 volatile int erts_break_requested = 0;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
diff --git a/erts/emulator/sys/win32/erl_poll.c b/erts/emulator/sys/win32/erl_poll.c
index a766fe9575..d84ae2ede2 100644
--- a/erts/emulator/sys/win32/erl_poll.c
+++ b/erts/emulator/sys/win32/erl_poll.c
@@ -297,11 +297,11 @@ struct ErtsPollSet_ {
 #define ERTS_POLLSET_UNLOCK(PS) \
   erts_smp_mtx_unlock(&(PS)->mtx)
 #define ERTS_POLLSET_SET_POLLED_CHK(PS) \
-  ((int) erts_smp_atomic_xchg(&(PS)->polled, (long) 1))
+  ((int) erts_smp_atomic_xchg(&(PS)->polled, (erts_aint_t) 1))
 #define ERTS_POLLSET_SET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 1)
+  erts_smp_atomic_set(&(PS)->polled, (erts_aint_t) 1)
 #define ERTS_POLLSET_UNSET_POLLED(PS) \
-  erts_smp_atomic_set(&(PS)->polled, (long) 0)
+  erts_smp_atomic_set(&(PS)->polled, (erts_aint_t) 0)
 #define ERTS_POLLSET_IS_POLLED(PS) \
   ((int) erts_smp_atomic_read(&(PS)->polled))
 
@@ -309,11 +309,11 @@ struct ErtsPollSet_ {
 #define ERTS_POLLSET_SET_POLLER_WOKEN(PS) 				\
 do {									\
       ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->woken, (long) 1);			\
+      erts_smp_atomic_set(&(PS)->woken, (erts_aint_t) 1);			\
 } while (0)
 #define ERTS_POLLSET_UNSET_POLLER_WOKEN(PS)				\
 do {									\
-    erts_smp_atomic_set(&(PS)->woken, (long) 0);			\
+    erts_smp_atomic_set(&(PS)->woken, (erts_aint_t) 0);			\
     ERTS_THR_MEMORY_BARRIER;						\
 } while (0)
 #define ERTS_POLLSET_IS_POLLER_WOKEN(PS)				\
@@ -322,13 +322,13 @@ do {									\
 #define ERTS_POLLSET_UNSET_INTERRUPTED_CHK(PS) unset_interrupted_chk((PS))
 #define ERTS_POLLSET_UNSET_INTERRUPTED(PS)				\
 do {									\
-    erts_smp_atomic_set(&(PS)->interrupt, (long) 0);			\
+    erts_smp_atomic_set(&(PS)->interrupt, (erts_aint_t) 0);			\
     ERTS_THR_MEMORY_BARRIER;						\
 } while (0)
 #define ERTS_POLLSET_SET_INTERRUPTED(PS) 				\
 do {									\
       ERTS_THR_MEMORY_BARRIER;						\
-      erts_smp_atomic_set(&(PS)->interrupt, (long) 1);			\
+      erts_smp_atomic_set(&(PS)->interrupt, (erts_aint_t) 1);			\
 } while (0)
 #define ERTS_POLLSET_IS_INTERRUPTED(PS)					\
   ((int) erts_smp_atomic_read(&(PS)->interrupt))
@@ -336,7 +336,7 @@ do {									\
 static ERTS_INLINE int
 unset_interrupted_chk(ErtsPollSet ps)
 {
-    int res = (int) erts_smp_atomic_xchg(&ps->interrupt, (long) 0);
+    int res = (int) erts_smp_atomic_xchg(&ps->interrupt, (erts_aint_t) 0);
     ERTS_THR_MEMORY_BARRIER;
     return res;
 
@@ -346,7 +346,7 @@ static ERTS_INLINE int
 set_poller_woken_chk(ErtsPollSet ps)
 {
     ERTS_THR_MEMORY_BARRIER;
-    return (int) erts_smp_atomic_xchg(&ps->woken, (long) 1);
+    return (int) erts_smp_atomic_xchg(&ps->woken, (erts_aint_t) 1);
 }
 
 #else
@@ -413,9 +413,9 @@ set_poller_woken_chk(ErtsPollSet ps)
 #ifdef ERTS_SMP
 extern erts_smp_atomic_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 0)
 #else
 extern volatile int erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)
@@ -986,7 +986,7 @@ void erts_poll_interrupt_timed(ErtsPollSet ps,
     HARDTRACEF(("In erts_poll_interrupt_timed(%d,%ld)",set,msec));
 #ifdef ERTS_SMP
     if (set) {
-	if (erts_smp_atomic_read(&ps->timeout) > msec) {
+	if (erts_smp_atomic_read(&ps->timeout) > (erts_aint_t) msec) {
 	    ERTS_POLLSET_SET_INTERRUPTED(ps);
 	    wake_poller(ps);
 	}
@@ -1228,7 +1228,7 @@ int erts_poll_wait(ErtsPollSet ps,
 	erts_mtx_unlock(&w->mtx);
     }
  done:
-    erts_smp_atomic_set(&ps->timeout, LONG_MAX);
+    erts_smp_atomic_set(&ps->timeout, ERTS_AINT_T_MAX);
     *len = num;
     ERTS_POLLSET_UNLOCK(ps);
     HARDTRACEF(("Out erts_poll_wait"));
@@ -1314,7 +1314,7 @@ ErtsPollSet erts_poll_create_pollset(void)
     erts_smp_mtx_init(&ps->mtx, "pollset");
     erts_smp_atomic_init(&ps->interrupt, 0);
 #endif
-    erts_smp_atomic_init(&ps->timeout, LONG_MAX);
+    erts_smp_atomic_init(&ps->timeout, ERTS_AINT_T_MAX);
 
     HARDTRACEF(("Out erts_poll_create_pollset"));
     return ps;
diff --git a/erts/emulator/sys/win32/erl_win_dyn_driver.h b/erts/emulator/sys/win32/erl_win_dyn_driver.h
index 4949998abc..1347eead91 100644
--- a/erts/emulator/sys/win32/erl_win_dyn_driver.h
+++ b/erts/emulator/sys/win32/erl_win_dyn_driver.h
@@ -87,15 +87,15 @@ WDD_TYPEDEF(unsigned long, erts_alc_test, (unsigned long,
 					   unsigned long,
 					   unsigned long,
 					   unsigned long));
-WDD_TYPEDEF(long, driver_binary_get_refc, (ErlDrvBinary *dbp));
-WDD_TYPEDEF(long, driver_binary_inc_refc, (ErlDrvBinary *dbp));
-WDD_TYPEDEF(long, driver_binary_dec_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_get_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_inc_refc, (ErlDrvBinary *dbp));
+WDD_TYPEDEF(ErlDrvSInt, driver_binary_dec_refc, (ErlDrvBinary *dbp));
 WDD_TYPEDEF(ErlDrvPDL, driver_pdl_create, (ErlDrvPort));
 WDD_TYPEDEF(void, driver_pdl_lock, (ErlDrvPDL));
 WDD_TYPEDEF(void, driver_pdl_unlock, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_get_refc, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_inc_refc, (ErlDrvPDL));
-WDD_TYPEDEF(long, driver_pdl_dec_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_get_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_inc_refc, (ErlDrvPDL));
+WDD_TYPEDEF(ErlDrvSInt, driver_pdl_dec_refc, (ErlDrvPDL));
 WDD_TYPEDEF(void, driver_system_info, (ErlDrvSysInfo *, size_t));
 WDD_TYPEDEF(int, driver_get_now, (ErlDrvNowData *));
 WDD_TYPEDEF(int, driver_monitor_process, (ErlDrvPort port, 
diff --git a/erts/emulator/sys/win32/sys_interrupt.c b/erts/emulator/sys/win32/sys_interrupt.c
index d2449a1bdb..262f84babc 100644
--- a/erts/emulator/sys/win32/sys_interrupt.c
+++ b/erts/emulator/sys/win32/sys_interrupt.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2010. All Rights Reserved.
  * 
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -33,9 +33,9 @@
 #ifdef ERTS_SMP
 erts_smp_atomic_t erts_break_requested;
 #define ERTS_SET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 1)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 1)
 #define ERTS_UNSET_BREAK_REQUESTED \
-  erts_smp_atomic_set(&erts_break_requested, (long) 0)
+  erts_smp_atomic_set(&erts_break_requested, (erts_aint_t) 0)
 #else
 volatile int erts_break_requested = 0;
 #define ERTS_SET_BREAK_REQUESTED (erts_break_requested = 1)