Latest and greatest. Now OPAL is ready for the Windows prime-time.

The same treatement will happens on all sub-projects. The .h files
have to be C++ compatibles and all symbols with an external visibility
have to get the {PROJECT}_DECLSPEC in front of the prototype.

This commit was SVN r11340.

Author: bosilca

opal/class/opal_atomic_lifo.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -23,7 +23,11 @@
 #include "opal/class/opal_list.h"
 #include "opal/sys/atomic.h"
 
-/* Atomic Last In First Out lists. If we are in a multi-threaded environment then the
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+    /* Atomic Last In First Out lists. If we are in a multi-threaded environment then the
  * atomicity is insured via the compare-and-swap operation, if not we simply do a read
  * and/or a write.
  *
@@ -99,5 +103,9 @@ static inline opal_list_item_t* opal_atomic_lifo_pop( opal_atomic_lifo_t* lifo )
     return item;
 }
 
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
 #endif  /* OPAL_ATOMIC_LIFO_H_HAS_BEEN_INCLUDED */
 

opal/class/opal_free_list.c

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -102,7 +102,7 @@ int opal_free_list_grow(opal_free_list_t* flist, size_t num_elements)
     opal_list_append(&(flist->fl_allocations), (opal_list_item_t*) alloc_ptr);
     ptr = alloc_ptr + sizeof(opal_list_item_t);
 
-    mod = (unsigned long)ptr % CACHE_LINE_SIZE;
+    mod = (intptr_t)ptr % CACHE_LINE_SIZE;
     if(mod != 0) {
         ptr += (CACHE_LINE_SIZE - mod);
     }

opal/class/opal_free_list.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -44,14 +44,14 @@ struct opal_free_list_t
     opal_list_t fl_allocations;
 };
 typedef struct opal_free_list_t opal_free_list_t;
-OBJ_CLASS_DECLARATION(opal_free_list_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_free_list_t);
 
 struct opal_free_list_item_t
 { 
     opal_list_item_t super; 
 }; 
 typedef struct opal_free_list_item_t opal_free_list_item_t; 
-OBJ_CLASS_DECLARATION(opal_free_list_item_t);
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_free_list_item_t);
 
 /**
  * Initialize a free list.

opal/class/opal_list.h

@@ -172,7 +172,7 @@ typedef struct opal_list_t opal_list_t;
 static inline bool opal_list_is_empty(opal_list_t* list)
 {
     return (list->opal_list_sentinel.opal_list_next == 
-            &(list->opal_list_sentinel));
+        &(list->opal_list_sentinel) ? true : false);
 }
 
 
@@ -682,8 +682,8 @@ static inline void opal_list_insert_pos(opal_list_t *list, opal_list_item_t *pos
    * If index is greater than the length of the list, no action is
    * performed and false is returned.
    */
-  bool opal_list_insert(opal_list_t *list, opal_list_item_t *item, 
-                        long long idx);
+  OPAL_DECLSPEC bool opal_list_insert(opal_list_t *list, opal_list_item_t *item, 
+                                      long long idx);
 
 
     /**
@@ -703,8 +703,8 @@ static inline void opal_list_insert_pos(opal_list_t *list, opal_list_item_t *pos
      * containers remain valid, including those that point to elements
      * in \c xlist.
      */
-    void opal_list_join(opal_list_t *thislist, opal_list_item_t *pos, 
-                        opal_list_t *xlist);
+    OPAL_DECLSPEC void opal_list_join(opal_list_t *thislist, opal_list_item_t *pos, 
+                                      opal_list_t *xlist);
 
 
     /**
@@ -730,9 +730,9 @@ static inline void opal_list_insert_pos(opal_list_t *list, opal_list_item_t *pos
      * This is an O(N) operation because the length of both lists must
      * be recomputed.
      */
-    void opal_list_splice(opal_list_t *thislist, opal_list_item_t *pos,
-                          opal_list_t *xlist, opal_list_item_t *first,
-                          opal_list_item_t *last);
+    OPAL_DECLSPEC void opal_list_splice(opal_list_t *thislist, opal_list_item_t *pos,
+                                        opal_list_t *xlist, opal_list_item_t *first,
+                                        opal_list_item_t *last);
 
     /**
      * Comparison function for opal_list_sort(), below.
@@ -793,7 +793,7 @@ static inline void opal_list_insert_pos(opal_list_t *list, opal_list_item_t *pos
      * whatever the underlying type is).  See the documentation of
      * opal_list_item_compare_fn_t for an example).
      */
-    int opal_list_sort(opal_list_t* list, opal_list_item_compare_fn_t compare);
+    OPAL_DECLSPEC int opal_list_sort(opal_list_t* list, opal_list_item_compare_fn_t compare);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

opal/class/opal_object.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -119,7 +119,9 @@
 #include <stdlib.h>
 #endif  /* HAVE_STDLIB_H */
 
+#if OMPI_HAVE_THREAD_SUPPORT
 #include "opal/sys/atomic.h"
+#endif  /* OMPI_HAVE_THREAD_SUPPORT */
 
 /*
  * BEGIN_C_DECLS should be used at the beginning of your declarations,
@@ -333,8 +335,8 @@ do {                                                            \
 } while (0)
 
 BEGIN_C_DECLS
-OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t);
 
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_object_t);
 
 /* declarations *******************************************************/
 

opal/class/opal_value_array.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -39,9 +39,6 @@
 extern "C" {
 #endif
 
-OPAL_DECLSPEC extern opal_class_t opal_value_array_t_class;
-
-
 struct opal_value_array_t
 {
     opal_object_t    super;
@@ -52,7 +49,7 @@ struct opal_value_array_t
 };
 typedef struct opal_value_array_t opal_value_array_t;
 
-
+OPAL_DECLSPEC OBJ_CLASS_DECLARATION(opal_value_array_t);
 
 /**
  *  Initialize the array to hold items by value. This routine must 
@@ -129,7 +126,7 @@ static inline size_t opal_value_array_get_size(opal_value_array_t* array)
  *  return the new size.
  */
 
-int opal_value_array_set_size(opal_value_array_t* array, size_t size);
+OPAL_DECLSPEC int opal_value_array_set_size(opal_value_array_t* array, size_t size);
 
 
 /** 

opal/event/buffer.c

@@ -343,7 +343,7 @@ evbuffer_read(struct evbuffer *buf, int fd, int howmuch)
 	int n = EVBUFFER_MAX_READ;
 #endif
 
-#ifdef FIONREAD
+#if !defined(__WINDOWS__) && defined(FIONREAD)
 #ifdef WIN32
 	if (ioctlsocket(fd, FIONREAD, &n) == -1 || n == 0) {
 #else

opal/event/evbuffer.c

@@ -155,7 +155,12 @@ bufferevent_writecb(int fd, short event, void *arg)
 	    if (res == -1) {
 		    if (errno == EAGAIN ||
 			errno == EINTR ||
-			errno == EINPROGRESS)
+#if !defined(__WINDOWS__)
+			errno == EINPROGRESS
+#else
+                        0
+#endif  /* !defined(__WINDOWS__) */
+                       )
 			    goto reschedule;
 		    /* error case */
 		    what |= OPAL_EVBUFFER_ERROR;

opal/event/event.c

@@ -82,16 +82,6 @@ extern const struct opal_eventop opal_kqops;
 extern const struct opal_eventop devpollops;
 #endif
 
-#if 0
-/* This is to prevent event library from picking up the win32_ops
-   since this will be picked up over select(). By using select, we can
-   pretty much use the OOB and PTL as is. Otherwise, there would have
-   to be a lot of magic to be done to get this to work */
-#if defined(WIN32) && WIN32
-extern const struct opal_eventop opal_win32ops;
-#endif
-#endif
-
 /* In order of preference */
 static const struct opal_eventop *eventops[] = {
 #if 0 /* no KQUEUE or EPOLL support for us -- neither seem to work
@@ -119,16 +109,18 @@ static const struct opal_eventop *eventops[] = {
 #if defined(HAVE_SELECT) && HAVE_SELECT
 	&opal_selectops,
 #endif
-#if 0
-	/* This is to prevent event library from picking up the
-	   win32_ops since this will be picked up over select(). By
-	   using select, we can pretty much use the OOB and PTL as
-	   is. Otherwise, there would have to be a lot of magic to be
-	   done to get this to work */
-#if defined(WIN32) && WIN32
+	/**
+      * One of the most stupid comment in the libevent project. Why ? How ?
+      *
+      * This is to prevent event library from picking up the
+	  * win32_ops since this will be picked up over select(). By
+	  * using select, we can pretty much use the OOB and PTL as
+	  * is. Otherwise, there would have to be a lot of magic to be
+	  * done to get this to work
+      */
+#if defined(__WINDOWS__)
 	&opal_win32ops,
-#endif
-#endif
+#endif  /* defined(__WINDOWS__) */
 	NULL
 };
 
@@ -149,8 +141,6 @@ static int opal_event_haveevents(struct event_base *);
 
 static void opal_event_process_active(struct event_base *);
 
-extern int opal_evsignal_restart(void);
-
 static int	timeout_next(struct event_base *, struct timeval *);
 static void	timeout_process(struct event_base *);
 static void	timeout_correct(struct event_base *, struct timeval *);
@@ -237,7 +227,7 @@ opal_event_init(void)
 
 #if OPAL_HAVE_WORKING_EVENTOPS
 
-	if ((current_base = calloc(1, sizeof(struct event_base))) == NULL)
+	if ((current_base = (event_base*)calloc(1, sizeof(struct event_base))) == NULL)
 		event_err(1, "%s: calloc");
 
 	event_sigcb = NULL;
@@ -362,7 +352,7 @@ int opal_event_disable(void)
 
 int opal_event_restart(void)
 {
-#if OPAL_HAVE_WORKING_EVENTOPS
+#if OPAL_HAVE_WORKING_EVENTOPS && !defined(__WINDOWS__)
 	int rc;
 #if OMPI_ENABLE_PROGRESS_THREADS
 	opal_mutex_lock(&opal_event_lock);
@@ -379,8 +369,10 @@ int opal_event_restart(void)
 #endif
 
 	opal_event_enable();
+#if !defined(__WINDOWS__)
 	if((rc = opal_evsignal_restart()) != 0)
 		return OPAL_ERROR;
+#endif  /* defined(__WINDOWS__) */
 	return (OPAL_SUCCESS);
 #else /* OPAL_HAVE_WORKING_EVENTOPS */
 	return OPAL_ERR_NOT_SUPPORTED;
@@ -568,7 +560,7 @@ opal_event_base_loop(struct event_base *base, int flags)
 				}
 			}
 		}
-
+#if !defined(__WINDOWS__)
 		/* Check if time is running backwards */
 		gettimeofday(&tv, NULL);
 		if (timercmp(&tv, &base->event_tv, <)) {
@@ -579,7 +571,7 @@ opal_event_base_loop(struct event_base *base, int flags)
 			timeout_correct(base, &off);
 		}
 		base->event_tv = tv;
-
+#endif  /* !defined(__WINDOWS__) */
 		if (!base->event_count_active && !(flags & OPAL_EVLOOP_NONBLOCK))
 			timeout_next(base, &tv);
 		else