2006-06-13 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / io-layer / collection.h

diff --git a/mono/io-layer/collection.h b/mono/io-layer/collection.h
index ad6905f34df154724d6de1e636fe91f5e19d08ee..95831d3f60ce4849965fff3009575263d48172a0 100644 (file)
--- a/mono/io-layer/collection.h
+++ b/mono/io-layer/collection.h
@@ -12,31 +12,16 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define _WAPI_HANDLE_COLLECTION_UPDATE_INTERVAL                10
-#define _WAPI_HANDLE_COLLECTION_EXPIRED_INTERVAL       300
-
-#define _WAPI_HANDLE_COLLECTION_UNSAFE                         \
-       {                                                       \
-               guint32 _wapi_save_start;                       \
-               int _wapi_thr_ret;                                      \
-                                                                       \
-               do {                                                    \
-                       _wapi_save_start = (guint32)(time(NULL) & 0xFFFFFFFF);\
-                                                                       \
-                       _wapi_thr_ret = _wapi_timestamp_exclusion (&_wapi_shared_layout->master_timestamp, _wapi_save_start); \
-                       if (_wapi_thr_ret == EBUSY) {                   \
-                               _wapi_handle_spin (100);                \
-                       }                                               \
-               } while (_wapi_thr_ret == EBUSY);                       \
-               g_assert (_wapi_thr_ret == 0);
-
-               
-#define _WAPI_HANDLE_COLLECTION_SAFE                           \
-               _wapi_thr_ret = _wapi_timestamp_release (&_wapi_shared_layout->master_timestamp, _wapi_save_start); \
-       }
-       
+#define _WAPI_HANDLE_COLLECTION_EXPIRED_INTERVAL       60
+
+#include <mono/io-layer/shared.h>
 
 extern void _wapi_collection_init (void);
 extern void _wapi_handle_collect (void);
 
+G_END_DECLS
+
 #endif /* _WAPI_COLLECTION_H_ */