mpich-1.2.6-lustre.patch

lustre 1.6.5 source code

+    ADIOI_GEN_ReadStridedColl(fd, buf, count, datatype, file_ptr_type,
+			      offset, status, error_code);
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_read.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_read.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_read.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_read.c	2005-12-06 11:54:37.907127727 -0500
@@ -0,0 +1,67 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_read.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+void ADIOI_LUSTRE_ReadContig(ADIO_File fd, void *buf, int count, 
+                     MPI_Datatype datatype, int file_ptr_type,
+		     ADIO_Offset offset, ADIO_Status *status, int *error_code)
+{
+    int err=-1, datatype_size, len;
+#if defined(MPICH2) || !defined(PRINT_ERR_MSG)
+    static char myname[] = "ADIOI_LUSTRE_READCONTIG";
+#endif
+
+    MPI_Type_size(datatype, &datatype_size);
+    len = datatype_size * count;
+
+    if (file_ptr_type == ADIO_EXPLICIT_OFFSET) {
+	if (fd->fp_sys_posn != offset) 
+	    lseek(fd->fd_sys, offset, SEEK_SET);
+	err = read(fd->fd_sys, buf, len);
+	fd->fp_sys_posn = offset + len;
+	/* individual file pointer not updated */        
+    }
+    else {  /* read from curr. location of ind. file pointer */
+	if (fd->fp_sys_posn != fd->fp_ind)
+	    lseek(fd->fd_sys, fd->fp_ind, SEEK_SET);
+	err = read(fd->fd_sys, buf, len);
+	fd->fp_ind += err; 
+	fd->fp_sys_posn = fd->fp_ind;
+    }         
+
+#ifdef HAVE_STATUS_SET_BYTES
+    if (err != -1) MPIR_Status_set_bytes(status, datatype, err);
+#endif
+
+    if (err == -1) {
+#ifdef MPICH2
+	*error_code = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, MPI_ERR_IO, "**io",
+	    "**io %s", strerror(errno));
+#elif defined(PRINT_ERR_MSG)
+			*error_code = MPI_ERR_UNKNOWN;
+#else /* MPICH-1 */
+	*error_code = MPIR_Err_setmsg(MPI_ERR_IO, MPIR_ADIO_ERROR,
+			      myname, "I/O Error", "%s", strerror(errno));
+	ADIOI_Error(fd, *error_code, myname);	    
+#endif
+    }
+    else *error_code = MPI_SUCCESS;
+}
+
+
+
+
+void ADIOI_LUSTRE_ReadStrided(ADIO_File fd, void *buf, int count,
+                       MPI_Datatype datatype, int file_ptr_type,
+                       ADIO_Offset offset, ADIO_Status *status, int
+                       *error_code)
+{
+    ADIOI_GEN_ReadStrided(fd, buf, count, datatype, file_ptr_type,
+                        offset, status, error_code);
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_resize.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_resize.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_resize.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_resize.c	2005-12-06 11:54:37.909127460 -0500
@@ -0,0 +1,32 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_resize.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+void ADIOI_LUSTRE_Resize(ADIO_File fd, ADIO_Offset size, int *error_code)
+{
+    int err;
+#if defined(MPICH2) || !defined(PRINT_ERR_MSG)
+    static char myname[] = "ADIOI_LUSTRE_RESIZE";
+#endif
+    
+    err = ftruncate(fd->fd_sys, size);
+    if (err == -1) {
+#ifdef MPICH2
+	*error_code = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, MPI_ERR_IO, "**io",
+	    "**io %s", strerror(errno));
+#elif defined(PRINT_ERR_MSG)
+			*error_code = MPI_ERR_UNKNOWN;
+#else /* MPICH-1 */
+	*error_code = MPIR_Err_setmsg(MPI_ERR_IO, MPIR_ADIO_ERROR,
+			      myname, "I/O Error", "%s", strerror(errno));
+	ADIOI_Error(fd, *error_code, myname);	    
+#endif
+    }
+    else *error_code = MPI_SUCCESS;
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_seek.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_seek.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_seek.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_seek.c	2005-12-06 11:54:37.911127194 -0500
@@ -0,0 +1,15 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_seek.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+ADIO_Offset ADIOI_LUSTRE_SeekIndividual(ADIO_File fd, ADIO_Offset offset, 
+		      int whence, int *error_code)
+{
+    return ADIOI_GEN_SeekIndividual(fd, offset, whence, error_code);
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wait.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wait.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wait.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wait.c	2005-12-06 11:54:37.914126794 -0500
@@ -0,0 +1,188 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_wait.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+void ADIOI_LUSTRE_ReadComplete(ADIO_Request *request, ADIO_Status *status, int *error_code)  
+{
+#ifndef NO_AIO
+#if defined(MPICH2) || !defined(PRINT_ERR_MSG)
+    static char myname[] = "ADIOI_LUSTRE_READCOMPLETE";
+#endif
+#ifdef AIO_SUN 
+    aio_result_t *result=0, *tmp;
+#else
+    int err;
+#endif
+#ifdef AIO_HANDLE_IN_AIOCB
+    struct aiocb *tmp1;
+#endif
+#endif
+
+    if (*request == ADIO_REQUEST_NULL) {
+	*error_code = MPI_SUCCESS;
+	return;
+    }
+
+#ifdef AIO_SUN
+    if ((*request)->queued) {  /* dequeue it */
+	tmp = (aio_result_t *) (*request)->handle;
+	while (tmp->aio_return == AIO_INPROGRESS) usleep(1000); 
+	/* sleep for 1 ms., until done. Is 1 ms. a good number? */
+	/* when done, dequeue any one request */
+	result = (aio_result_t *) aiowait(0);
+
+        (*request)->nbytes = tmp->aio_return;
+
+	if (tmp->aio_return == -1) {
+#ifdef MPICH2
+	    *error_code = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, MPI_ERR_IO, "**io",
+		"**io %s", strerror(tmp->aio_errno));
+	    return;
+#elif defined(PRINT_ERR_MSG)
+			*error_code = MPI_ERR_UNKNOWN;
+#else /* MPICH-1 */
+	    *error_code = MPIR_Err_setmsg(MPI_ERR_IO, MPIR_ADIO_ERROR,
+			  myname, "I/O Error", "%s", strerror(tmp->aio_errno));
+	    ADIOI_Error((*request)->fd, *error_code, myname);	    
+#endif
+	}
+	else *error_code = MPI_SUCCESS;
+
+/* aiowait only dequeues a request. The completion of a request can be
+   checked by just checking the aio_return flag in the handle passed
+   to the original aioread()/aiowrite(). Therefore, I need to ensure
+   that aiowait() is called exactly once for each previous
+   aioread()/aiowrite(). This is also taken care of in ADIOI_xxxDone */
+    }
+    else *error_code = MPI_SUCCESS;
+
+#ifdef HAVE_STATUS_SET_BYTES
+    if ((*request)->nbytes != -1)
+	MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
+#endif
+
+#endif
+    
+#ifdef AIO_HANDLE_IN_AIOCB
+/* IBM */
+    if ((*request)->queued) {
+	do {
+	    err = aio_suspend(1, (struct aiocb **) &((*request)->handle));
+	} while ((err == -1) && (errno == EINTR));
+
+	tmp1 = (struct aiocb *) (*request)->handle;
+	if (err != -1) {
+	    err = aio_return(tmp1->aio_handle);
+	    (*request)->nbytes = err;
+	    errno = aio_error(tmp1->aio_handle);
+	}
+	else (*request)->nbytes = -1;
+
+/* on DEC, it is required to call aio_return to dequeue the request.
+   IBM man pages don't indicate what function to use for dequeue.
+   I'm assuming it is aio_return! POSIX says aio_return may be called 
+   only once on a given handle. */
+
+	if (err == -1) {
+#ifdef MPICH2
+	    *error_code = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, MPI_ERR_IO, "**io",
+		"**io %s", strerror(errno));
+	    return;
+#elif defined(PRINT_ERR_MSG)
+			*error_code = MPI_ERR_UNKNOWN;
+#else /* MPICH-1 */
+	    *error_code = MPIR_Err_setmsg(MPI_ERR_IO, MPIR_ADIO_ERROR,
+             myname, "I/O Error", "%s", strerror(errno));
+	    ADIOI_Error((*request)->fd, *error_code, myname);	    
+#endif
+	}
+	else *error_code = MPI_SUCCESS;
+    } /* if ((*request)->queued)  */
+    else *error_code = MPI_SUCCESS;
+
+#ifdef HAVE_STATUS_SET_BYTES
+    if ((*request)->nbytes != -1)
+	MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
+#endif
+
+#elif (!defined(NO_AIO) && !defined(AIO_SUN))
+/* DEC, SGI IRIX 5 and 6 */
+    if ((*request)->queued) {
+	do {
+	    err = aio_suspend((const aiocb_t **) &((*request)->handle), 1, 0);
+	} while ((err == -1) && (errno == EINTR));
+
+	if (err != -1) {
+	    err = aio_return((struct aiocb *) (*request)->handle); 
+	    (*request)->nbytes = err;
+	    errno = aio_error((struct aiocb *) (*request)->handle);
+	}
+	else (*request)->nbytes = -1;
+
+	if (err == -1) {
+#ifdef MPICH2
+	    *error_code = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE, myname, __LINE__, MPI_ERR_IO, "**io",
+		"**io %s", strerror(errno));
+	    return;
+#elif defined(PRINT_ERR_MSG)
+			*error_code = MPI_ERR_UNKNOWN;
+#else /* MPICH-1 */
+	    *error_code = MPIR_Err_setmsg(MPI_ERR_IO, MPIR_ADIO_ERROR,
+	 	            myname, "I/O Error", "%s", strerror(errno));
+	    ADIOI_Error((*request)->fd, *error_code, myname);	    
+#endif
+	}
+	else *error_code = MPI_SUCCESS;
+    } /* if ((*request)->queued) */
+    else *error_code = MPI_SUCCESS;
+#ifdef HAVE_STATUS_SET_BYTES
+    if ((*request)->nbytes != -1)
+	MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
+#endif
+#endif
+
+#ifndef NO_AIO
+    if ((*request)->queued != -1) {
+
+	/* queued = -1 is an internal hack used when the request must
+	   be completed, but the request object should not be
+	   freed. This is used in ADIOI_Complete_async, because the user
+	   will call MPI_Wait later, which would require status to
+	   be filled. Ugly but works. queued = -1 should be used only
+	   in ADIOI_Complete_async. 
+           This should not affect the user in any way. */
+
+	/* if request is still queued in the system, it is also there
+           on ADIOI_Async_list. Delete it from there. */
+	if ((*request)->queued) ADIOI_Del_req_from_list(request);
+
+	(*request)->fd->async_count--;
+	if ((*request)->handle) ADIOI_Free((*request)->handle);
+	ADIOI_Free_request((ADIOI_Req_node *) (*request));
+	*request = ADIO_REQUEST_NULL;
+    }
+
+#else
+/* HP, FreeBSD, Linux */
+
+#ifdef HAVE_STATUS_SET_BYTES
+    MPIR_Status_set_bytes(status, (*request)->datatype, (*request)->nbytes);
+#endif
+    (*request)->fd->async_count--;
+    ADIOI_Free_request((ADIOI_Req_node *) (*request));
+    *request = ADIO_REQUEST_NULL;
+    *error_code = MPI_SUCCESS;
+#endif    
+}
+
+
+void ADIOI_LUSTRE_WriteComplete(ADIO_Request *request, ADIO_Status *status, int *error_code)  
+{
+    ADIOI_LUSTRE_ReadComplete(request, status, error_code);
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wrcoll.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wrcoll.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wrcoll.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_wrcoll.c	2005-12-06 11:54:37.914126794 -0500
@@ -0,0 +1,18 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_wrcoll.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+void ADIOI_LUSTRE_WriteStridedColl(ADIO_File fd, void *buf, int count,
+                       MPI_Datatype datatype, int file_ptr_type,
+                       ADIO_Offset offset, ADIO_Status *status, int
+                       *error_code)
+{
+    ADIOI_GEN_WriteStridedColl(fd, buf, count, datatype, file_ptr_type,
+			      offset, status, error_code);
+}
diff -r -u --new-file mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_write.c mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_write.c
--- mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_write.c	1969-12-31 19:00:00.000000000 -0500
+++ mpich-1.2.6/romio/adio/ad_lustre/ad_lustre_write.c	2005-12-06 11:54:37.914126794 -0500
@@ -0,0 +1,66 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/* 
+ *   $Id: ad_lustre_write.c,v 1.1.1.1 2004/11/04 11:03:38 liam Exp $    
+ *
+ *   Copyright (C) 1997 University of Chicago. 
+ *   See COPYRIGHT notice in top-level directory.
+ */
+
+#include "ad_lustre.h"
+
+void ADIOI_LUSTRE_WriteContig(ADIO_File fd, void *buf, int count, 
+                   MPI_Datatype datatype, int file_ptr_type,
+	           ADIO_Offset offset, ADIO_Status *status, int *error_code)
+{
+    int err=-1, datatype_size, len;
+#if defined(MPICH2) || !defined(PRINT_ERR_MSG)
+    static char myname[] = "ADIOI_LUSTRE_WRITECONTIG";
+#endif
+