[Sandiaportals-cvs] b_proto: portals/include/portals types.h

[Phil S. <ps...@us...>]

Update of /cvsroot/sandiaportals/portals/include/portals
In directory sc8-pr-cvs1:/tmp/cvs-serv15057/include/portals

Modified Files:
      Tag: b_proto
	types.h 
Log Message:
Merging b_devel into b_proto, 20030518


Index: types.h
===================================================================
RCS file: /cvsroot/sandiaportals/portals/include/portals/types.h,v
retrieving revision 1.31.2.2.6.1
retrieving revision 1.31.2.2.6.2
diff -u -w -b -B -p -r1.31.2.2.6.1 -r1.31.2.2.6.2
--- types.h	15 May 2003 20:03:15 -0000	1.31.2.2.6.1
+++ types.h	18 May 2003 15:50:31 -0000	1.31.2.2.6.2
@@ -3,10 +3,13 @@
 
 #ifdef __linux__
 #include <asm/types.h>
+#include <asm/timex.h>
 #else
 #include <sys/types.h>
 typedef u_int32_t __u32;
 typedef u_int64_t __u64;
+typedef unsigned long long cycles_t;
+static inline cycles_t get_cycles(void) { return 0; }
 #endif
 
 typedef __u64 ptl_nid_t;
@@ -105,6 +108,7 @@ typedef struct {
         ptl_handle_me_t unlinked_me;
         ptl_md_t mem_desc;
         ptl_hdr_data_t hdr_data;
+        cycles_t  arrival_time;
         volatile ptl_seq_t sequence;
 } ptl_event_t;