[PVFS2-CVS] commit by slang in pvfs2/src/io/job: thread-mgr.c

CVS commit program cvs at parl.clemson.edu
Wed Nov 9 20:27:06 EST 2005


Update of /projects/cvsroot/pvfs2/src/io/job
In directory parlweb:/tmp/cvs-serv439/src/io/job

Modified Files:
	thread-mgr.c 
Log Message:
* malloc.h is obsolete in freebsd, check for it
* No error.h in freebsd
* linux allows Lu,Lx, and Ld to be interchangeable with llu,llx, and
lld.  Other platforms (solaris, bsd) don't.  Replaced all the L*
with ll*.
* bsd doesn't have mntent.h.  use fstab.h and our own funcs.
* bsd doesn't know about ssize_t.  Use size_t instead.
* bsd doesn't have asm errnos.  Check for each of those
errno macros and if not defined define to -1
* check for db3/db.h db4/db.h header if db path is specified using
--with-db
* darwin has aio support builtin, doesn't need -lrt
* remove kernel stuff in pvfs2-types.h that sets WORDSIZE.  gcc
defines __LP64__ on archs with 64bit longs so we use that instead.
* darwin's open doesn't accept O_LARGEFILE.  off_t is an int64 by
default.  define O_LARGEFILE if it hasn't been.
* need to run ranlib on darwin after libpvfs2.a gets installed to regenerate
table of contents



Index: thread-mgr.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/job/thread-mgr.c,v
diff -p -u -r1.26 -r1.27
--- thread-mgr.c	29 Sep 2005 22:28:57 -0000	1.26
+++ thread-mgr.c	10 Nov 2005 01:27:06 -0000	1.27
@@ -521,21 +521,21 @@ int PINT_thread_mgr_bmi_cancel(PVFS_id_g
      * trying to cancel one of them
      */
 #if 0
-    gossip_err("THREAD MGR trying to cancel op: %Lu, ptr: %p.\n",
-	Lu(id), user_ptr);
+    gossip_err("THREAD MGR trying to cancel op: %llu, ptr: %p.\n",
+	llu(id), user_ptr);
 #endif
     for(i=0; i<bmi_test_count; i++)
     {
 #if 0
-	gossip_err("THREAD MGR bmi cancel scanning op: %Lu.\n", 
-	    Lu(stat_bmi_id_array[i]));
+	gossip_err("THREAD MGR bmi cancel scanning op: %llu.\n", 
+	    llu(stat_bmi_id_array[i]));
 #endif
 	if(stat_bmi_id_array[i] == id && stat_bmi_user_ptr_array[i] ==
 	    user_ptr)
 	{
 #if 0
-	    gossip_err("THREAD MGR bmi cancel SKIPPING op: %Lu.\n", 
-		Lu(stat_bmi_id_array[i]));
+	    gossip_err("THREAD MGR bmi cancel SKIPPING op: %llu.\n", 
+		llu(stat_bmi_id_array[i]));
 #endif
 	    /* match; no steps needed to cancel, the op is already done */
 	    gen_mutex_unlock(&bmi_test_mutex);
@@ -664,15 +664,15 @@ int PINT_thread_mgr_trove_cancel(PVFS_id
     for(i=0; i<trove_test_count; i++)
     {
 #if 0
-	gossip_err("THREAD MGR trove cancel scanning op: %Lu.\n", 
-	    Lu(stat_trove_id_array[i]));
+	gossip_err("THREAD MGR trove cancel scanning op: %llu.\n", 
+	    llu(stat_trove_id_array[i]));
 #endif
 	if(stat_trove_id_array[i] == id && stat_trove_user_ptr_array[i] ==
 	    user_ptr)
 	{
 #if 0
-	    gossip_err("THREAD MGR trove cancel SKIPPING op: %Lu.\n", 
-		Lu(stat_trove_id_array[i]));
+	    gossip_err("THREAD MGR trove cancel SKIPPING op: %llu.\n", 
+		llu(stat_trove_id_array[i]));
 #endif
 	    /* match; no steps needed to cancel, the op is already done */
 	    gen_mutex_unlock(&trove_test_mutex);



More information about the PVFS2-CVS mailing list