[PVFS2-CVS]
commit by slang in pvfs2/src/io/flow/flowproto-bmi-trove:
flowproto-multiqueue.c
CVS commit program
cvs at parl.clemson.edu
Wed Nov 9 20:27:05 EST 2005
Update of /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove
In directory parlweb:/tmp/cvs-serv439/src/io/flow/flowproto-bmi-trove
Modified Files:
flowproto-multiqueue.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: flowproto-multiqueue.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c,v
diff -p -u -r1.100 -r1.101
--- flowproto-multiqueue.c 25 Oct 2005 18:00:59 -0000 1.100
+++ flowproto-multiqueue.c 10 Nov 2005 01:27:05 -0000 1.101
@@ -465,9 +465,9 @@ int fp_multiqueue_cancel(flow_descriptor
if(flow_d->state != FLOW_COMPLETE)
{
gossip_debug(GOSSIP_CANCEL_DEBUG,
- "PINT_flow_cancel() called on active flow, %Ld "
+ "PINT_flow_cancel() called on active flow, %lld "
"bytes transferred.\n",
- Ld(flow_d->total_transfered));
+ lld(flow_d->total_transfered));
assert(flow_d->state == FLOW_TRANSMITTING);
handle_io_error(-PVFS_ECANCEL, NULL, flow_data);
}
More information about the PVFS2-CVS
mailing list