From: Dan Bonachea (bonachea_at_cs_dot_berkeley_dot_edu)
Date: Fri Mar 09 2007 - 15:42:00 PST
Dan Bonachea <bonachea_at_cs_dot_berkeley_dot_edu>
committed changes to cvs project: gasnet (branch BERKELEY_UPC_2_4_BRANCH)
on Fri Mar 9 15:37:48 PST 2007
--- Log message ---
fix a timer library bug reported by GWU for Altix 4700 running kernel 2.6.16
--- Changed files ---
gasnet/configure.in
gasnet/gasnet_timer.h
--- Diffs ---
Index: gasnet/configure.in
diff -c gasnet/configure.in:1.420 gasnet/configure.in:1.420.2.1
*** gasnet/configure.in:1.420 Wed Nov 1 15:11:39 2006
--- gasnet/configure.in Fri Mar 9 15:37:48 2007
***************
*** 2497,2502 ****
--- 2497,2504 ----
AC_CHECK_HEADERS(features.h)
AC_CHECK_FUNCS(fopen64)
+ AC_CHECK_HEADERS([sn/mmtimer.h linux/mmtimer.h])
+
########################################################################
# BACKTRACE support
Index: gasnet/gasnet_timer.h
diff -c gasnet/gasnet_timer.h:1.75 gasnet/gasnet_timer.h:1.75.2.1
*** gasnet/gasnet_timer.h:1.75 Tue Sep 12 18:40:22 2006
--- gasnet/gasnet_timer.h Fri Mar 9 15:37:48 2007
***************
*** 168,174 ****
#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
! #include <sn/mmtimer.h>
typedef uint64_t gasneti_tick_t;
/* EXTERNC here fixes a mysterious C++ linkage error on davinci */
GASNETI_EXTERNC double gasneti_timer_tick; /* tick conversion factor */
--- 168,181 ----
#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
! #if HAVE_SN_MMTIMER_H
! #include <sn/mmtimer.h>
! #elif HAVE_LINUX_MMTIMER_H
! #include <linux/mmtimer.h>
! #endif
! #ifndef MMTIMER_FULLNAME
! #define MMTIMER_FULLNAME "/dev/mmtimer"
! #endif
typedef uint64_t gasneti_tick_t;
/* EXTERNC here fixes a mysterious C++ linkage error on davinci */
GASNETI_EXTERNC double gasneti_timer_tick; /* tick conversion factor */