[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-27-gd5a4685
Service Account
noreply at mpich.org
Fri Nov 28 03:05:50 CST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via d5a4685bf65bc28b1077d967244ea529af1bfc20 (commit)
via 26f9381c64b7d987eda3b2a93377ce8b98c57dc5 (commit)
via 5ad7c79e3dcd39830f4d79213672619ea6ae0242 (commit)
from 4ad367d0d17f6cecf5d0a9ce6def7d92779f7be2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/d5a4685bf65bc28b1077d967244ea529af1bfc20
commit d5a4685bf65bc28b1077d967244ea529af1bfc20
Author: Pavan Balaji <balaji at anl.gov>
Date: Sat Nov 22 11:21:25 2014 -0600
Move static function to sit inside !defined MPICH_MPI_FROM_PMPI.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c
index 3159452..0b7b4a5 100644
--- a/src/mpi/comm/intercomm_merge.c
+++ b/src/mpi/comm/intercomm_merge.c
@@ -21,6 +21,12 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) __
/* -- End Profiling Symbol Block */
+/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
+ the MPI routines */
+#ifndef MPICH_MPI_FROM_PMPI
+#undef MPI_Intercomm_merge
+#define MPI_Intercomm_merge PMPI_Intercomm_merge
+
/* This function creates VCRT for new communicator
* basing on VCRT of existing communicator.
*/
@@ -73,12 +79,6 @@ fn_fail:
return mpi_errno;
}
-/* Define MPICH_MPI_FROM_PMPI if weak symbols are not supported to build
- the MPI routines */
-#ifndef MPICH_MPI_FROM_PMPI
-#undef MPI_Intercomm_merge
-#define MPI_Intercomm_merge PMPI_Intercomm_merge
-
#undef FUNCNAME
#define FUNCNAME MPIR_Intercomm_merge_impl
#undef FCNAME
http://git.mpich.org/mpich.git/commitdiff/26f9381c64b7d987eda3b2a93377ce8b98c57dc5
commit 26f9381c64b7d987eda3b2a93377ce8b98c57dc5
Author: Pavan Balaji <balaji at anl.gov>
Date: Sat Nov 22 11:19:58 2014 -0600
No need to namespace a static function that is unused outside.
Also remove the function prototype declaration since it is not used
out-of-order.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/mpi/comm/intercomm_merge.c b/src/mpi/comm/intercomm_merge.c
index db320de..3159452 100644
--- a/src/mpi/comm/intercomm_merge.c
+++ b/src/mpi/comm/intercomm_merge.c
@@ -20,19 +20,16 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) __
#endif
/* -- End Profiling Symbol Block */
-/* These functions help implement the merge procedure */
-static int MPIR_Intercomm_merge_create_and_map_vcrt(MPID_Comm *comm_ptr, int local_high, MPID_Comm *new_intracomm_ptr);
-
/* This function creates VCRT for new communicator
* basing on VCRT of existing communicator.
*/
#undef FUNCNAME
-#define FUNCNAME MPIR_Intercomm_merge_create_and_map_vcrt
+#define FUNCNAME create_and_map_vcrt
#undef FCNAME
#define FCNAME MPIDI_QUOTE(FUNCNAME)
-static int MPIR_Intercomm_merge_create_and_map_vcrt(MPID_Comm *comm_ptr, int local_high, MPID_Comm *new_intracomm_ptr)
+static int create_and_map_vcrt(MPID_Comm *comm_ptr, int local_high, MPID_Comm *new_intracomm_ptr)
{
int mpi_errno = MPI_SUCCESS;
int i, j;
@@ -174,7 +171,7 @@ int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_int
/* Now we know which group comes first. Build the new vcr
from the existing vcrs */
- mpi_errno = MPIR_Intercomm_merge_create_and_map_vcrt(comm_ptr, local_high, (*new_intracomm_ptr));
+ mpi_errno = create_and_map_vcrt(comm_ptr, local_high, (*new_intracomm_ptr));
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
/* We've setup a temporary context id, based on the context id
@@ -208,7 +205,7 @@ int MPIR_Intercomm_merge_impl(MPID_Comm *comm_ptr, int high, MPID_Comm **new_int
(*new_intracomm_ptr)->context_id = new_context_id;
(*new_intracomm_ptr)->recvcontext_id = new_context_id;
- mpi_errno = MPIR_Intercomm_merge_create_and_map_vcrt(comm_ptr, local_high, (*new_intracomm_ptr));
+ mpi_errno = create_and_map_vcrt(comm_ptr, local_high, (*new_intracomm_ptr));
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
mpi_errno = MPIR_Comm_commit((*new_intracomm_ptr));
http://git.mpich.org/mpich.git/commitdiff/5ad7c79e3dcd39830f4d79213672619ea6ae0242
commit 5ad7c79e3dcd39830f4d79213672619ea6ae0242
Author: Pavan Balaji <balaji at anl.gov>
Date: Sat Nov 22 11:07:46 2014 -0600
Remove old unused errnames.
Signed-off-by: Wesley Bland <wbland at anl.gov>
diff --git a/src/mpi/errhan/errnames-old.txt b/src/mpi/errhan/errnames-old.txt
deleted file mode 100644
index 213b2c8..0000000
--- a/src/mpi/errhan/errnames-old.txt
+++ /dev/null
@@ -1,286 +0,0 @@
-# These are unused error names, saved in case they're added again
-**abort:application called MPI_ABORT
-**allocmem %d %d:Unable to allocate %d memory for MPI_Alloc_mem; only %d available
-**argaddress:Address of location given to MPI_ADDRESS does not fix in a \
-Fortran integer
-**argaddress %ld:Address of location given to MPI_ADDRESS does not fix in a \
-Fortran integer (value is %ld)
-**argarray:Invalid value in array
-**argarray %s %d %d:Invalid value in %s[%d] = %d
-**argnamed:Invalid argument
-**argnamed %s %d:Invalid argument %s with value %d
-#
-# ch3:essm
-#
-**argstr_shmevent:shared memory event not found in the business card
-**event_create:unable to create an event
-**event_open:unable to open an event
-**event_reset:unable to reset an event
-**event_set:unable to set an event
-**event_wait:unable to wait on an event
-**postwrite:postwrite failed
-**postwrite %p %p:postwrite failed (%p %p)
-#
-**attrcopy:User defined attribute copy routine returned a non-zero return code
-**attrcopy %d:User defined attribute copy routine returned a non-zero return code %d
-**bad_conn:bad conn structure pointer
-**bad_conn %p %p:bad conn structure pointer (%p != %p)
-**badpacket:Received a packet of unknown type
-**badpacket %d:Received a packet of unknown type (%d)
-**bad_sock %d %d:bad sock (%d != %d)
-**base %d:Invalid base address %d
-**boot_attach:failed to attach to a bootstrap queue
-**boot_attach %s:failed to attach to a bootstrap queue - %s
-**bootqmsg %d %d:invalid bootstrap queue message size (%d bytes > %d)
-**bsendnobuf:No buffer to detach.
-**bufalias %s %s:Buffer parameters %s and %s must not be aliased
-**bufsize:Invalid buffer size
-**bufsize %d:Invalid buffer size (value is %d)
-**ca:invalid completion action
-**ca %d:invalid completion action (%d)
-**cancelperrecv:Cancellation of persistent receive requests is not supported
-**cancelpersend:Cancellation of persistent send requests is not supported
-**cancelsend:Cancellation of send requests is not supported
-# CH3:rdma
-**ch3_finalize:Channel finalization failed
-**ch3progress:Unable to make message passing progress
-**ch3progress %d:Channel progress engine failed on line %d
-**ch3_init:Channel init failed
-**ch3_send:send failed
-**read_progress:Unable to make read progress
-**handle_read:Unable to handle the read data
-**process_group:Process group initialization failed
-**rdma_finalize:Channel rdma finalization failed
-**rdma_init:Channel rdma initialization failed
-**poke:progress_poke failed
-**postpkt:Unable to post a read for the next packet header
-**write_progress:Write progress failed
-#
-**ch3|putpkt:UNIMPLEMENTED: unable to handling put packets
-**ch3|sock|addrinuse %d:[ch3:sock] tcp port %d already in use
-**ch3|sock|badbuscard:[ch3:sock] GetHostAndPort - Invalid business card
-**ch3|sock|badbuscard %s:[ch3:sock] GetHostAndPort - Invalid business card (%s)
-**ch3|sock|bizcard_cache:business card does not match the one in the cache
-**ch3|sock|bizcard_cache %s %s:business card in cache: %s, business card passed: %s
-**ch3|sock|connallocfailed:[ch3:sock] unable to allocate a connection structure
-**ch3|sock|connfailed %d %d:[ch3:sock] failed to connnect to remote process %d:%d
-**ch3|sock|hostlookup %s %d %s:[ch3:sock] failed to obtain host information for process %s:%d (%s)
-#
-**fcntl:fcntl failed
-**needthreads:This function needs threads and threads have not been enabled
-**winpassive:Attempt to use passive target access with a window not allocated \
-with MPI_Alloc_mem.
-**namepublish %s:Unable to publish service name %s
-**spawnfail:Could not spawn all requested processes
-**failure:unknown failure
-**post_write %p %p:Unable to post a write (%p %p)
-**socket %d:WSASocket failed (errno %d)
-**shmq:invalid shm queue pointer
-**mx_get_info:mx_get_info failed
-**internrc %d:Internal MPI error! Unexpected return code from internal function (rc=%d).
-**mpi_status_f2c:MPI_Status_f2c failed
-**hostlookup:Host lookup failed
-**mpi_wtick:MPI_Wtick failed
-**ioneedwr:Write access is required to this file
-**winnamelen:Specified window object name is too long
-**mpi_type_test:MPI_Type_test failed
-**iofstype:Cannot determine filesystem type
-**countarray:Invalid count in count array
-**dimstensor %d %d:Tensor product size is %d but must be the same as the number of \
- nodes, which is %d
-**shmctl %d:shmctl failed, error %d
-**keyvalwin:Keyval is not in window object
-**rangeinvalid:Invalid range
-**f90typetoomany %s %d:Too many requests for unnamed, predefined f90 %s \
- types; no more than %d allowed.
-**nameservice %s:Invalid service name %s (see MPI_Publish_name)
-**namepublish:Unable to publish service name
-**connclose:active connection unexpectedly closed
-**mpi_pcontrol %d:MPI_Pcontrol(level=%d) failed
-**dtypecomm:Pack buffer not packed for this communicator.
-**spawnpgm:The named program could not be found
-**listen %d:listen failed (errno %d)
-**badsock:internal error - bad sock
-**pkt_type:invalid packet type
-**pkt_type %d:invalid packet type (%d)
-**connterm:active connection unexpectedly terminated
-**opundefined_rma %d:RMA target received unknown RMA operation type %d
-**duphandle %d:unable to duplicate a handle (errno %d)
-**keyvalperm:Cannot free permanent attribute key
-**inet_ntop:inet_ntop failed
-**notsamevalue:Arguments to collective routine must be the same
-**invalid_shmq:invalid shm queue pointer
-**startup:Error on startup, such as a \
- mismatch between mpiexec and the MPI libraries
-**ioamodeseq %s:Cannot use function %s when the file is opened with amode \
- MPI_MODE_SEQUENTIAL
-**preinit %s:MPI_Init or MPI_Init_thread must be called before %s
-**rootlarge:Value of root is too large
-**dtypepermcontents:Cannot get contents of a permanent or basic data type
-**connfailed %d %d:Failed to connect to remote process %d-%d
-**fcntl %s:fcntl failed - %s
-**getinfo %d:getaddrinfo failed (errno %d)
-**contextIdInUse:Context id already in use
-**mpi_wtime:MPI_Wtime failed
-**intracomm:Intracommunicator is not allowed
-**infovallong %s %d %d:Value %s is too long (length is %d but maximum length is %d)
-**sock_gethost %d:gethostname failed (errno %d)
-**intercommcoll %s:Intercommunicator collective operation for %s has not been implemented
-**iofilenull:Null file handle
-**sock_iocp:unable to create an I/O completion port
-**dev|pg_destroy|pg_not_found:process group being destroyed was not in the process group list
-**dev|pg_destroy|pg_not_found %p:process group being destroyed was not in the process group list (pg=%p)
-**servicename %s:Attempt to lookup an unknown service name %s
-**multi_post_write:posting a write while a previously posted write is outstanding
-**mx_get_info %s:mx_get_info failed (%s)
-**statusignore:Invalid use of MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE
-**gethostbyname %d:gethostbyname failed (errno %d)
-**fileopunsupported %s:Unsupported file operation %s
-**notsameorder:Collective routines called in an inconsistent order
-#**notsameorder:Collective routines called in an inconsistent order (optional arguments: null terminated
-# array of names (array of string))
-**sock_byname %d:gethostbyname failed (errno %d)
-**sockw_badwsethnd: Invalid handle to waitSet
-**mpi_pcontrol:MPI_Pcontrol failed
-**failure %d:unknown failure, error %d
-**shmdt %s:shmdt failed - %s
-**preinit:MPI_Init or MPI_Init_thread must be called first
-**not_in_local_ranks:cannot find our rank in the list of local processes
-**inet_pton %s:inet_pton failed - %s
-**fileinuse %s:File %s is in use by some process
-**ioasyncwaiting:There are outstanding nonblocking I/O operations on this file
-**init_comm_create:unable to create an intercommunicator for the parent
-**post_sock_write_on_shm:posting a socket read on a shm connection
-**rootlarge %d %d:Value of root is too large (value is %d but must be less than %d)
-**mx_wait:mx_wait failed
-**init_strtok_host:failed to copy the hostname from the business card
-**iosequnsupported %s:MPI_MODE_SEQUENTIAL not supported on file system %s
-**keyvalcomm:Keyval is not in communicator
-**commpeer:Peer communicator is not valid
-**iofstypeunsupported %s:Specified filesystem %s is not available
-**GetMemTwice:Global shared memory initializer called more than once
-**inet_addr %s %s %d: inet_addr on %s failed, %s (errno %d)
-**othersys %s:System resource (%s) limit exceeded
-**getsockopt %s:getsockopt failed - %s
-**filenospace %s %d %d:Not enough space for file %s; %d needed but only %d available
-**ibv_open_device %p:ibv_open_device failed got list (%p)
-**init_comm_create %d:unable to create an intercommunicator for the parent (error %d)
-**ibu_op:invalid infiniband operation
-**iofilecorrupt:File corrupt
-**shutdown %d:shutdown failed (errno %d)
-**sock_iocp %d:unable to create an I/O completion port (errno %d)
-**post_write:Unable to post a write
-**keyvaldtype:Keyval is not in datatype
-**errhandlerperm:Cannot free permanent error handler
-**closesocket %d:closesocket failed (errno %d)
-**shm_wait:wait function failed
-**opundefined_rma:RMA target received unknown RMA operation
-**ibwrite:infiniband write failed
-**ioneedrdwr:Read/write access is required to this file
-**dimsarray %d %d:Value of dims[%d] is %d which is invalid
-**select %s:select failed - %s
-**iodispnotcurrent:Displacement must be set to MPI_DISPLACEMENT_CURRENT \
- since file was opened with MPI_MODE_SEQUENTIAL
-**connfailed:Failed to connect to remote process
-**dtypeperm %s:Cannot free permanent data type %s
-**mpi_status_c2f:MPI_Status_c2f failed
-**boot_tostring:unable to get a string representation of the boostrap queue
-**porttimeout:Time out attempting an MPI_Comm_connect to a port
-**contextIdNotInUse %d:Context id %d to be freed is not in use
-**dtypepermcontents %s:Cannot get contents of a permanent or basic data type %s
-**countarray %d %d:Invalid count in the %d element of the count array; value \
-is %d
-**mpi_status_c2f %p %p:MPI_Status_c2f(c_status=%p, f_status=%p) failed
-**conn_still_active:connection closed while still active
-**sock_post_close %d:posting a close of the socket failed (errno %d)
-**servicenameunpublish:Attempt to unpublish an unknown service name
-**grapharraysize:Specified edge less than zero or greater than nnodes
-**commname:Cannot set name in communicator
-**dimsarray:Invalid dimension argument in array
-**infokeylong %s %d %d:Key %s is too long (length is %d but maximum allowed is %d)
-**count %d:Invalid count, value = %d
-**invalid_refcount %d %p %d:invalid reference count (handle=%d, object=%p, count=%d)
-**sock_create %d:unable to create a socket (errno %d)
-**nouniquehigh:Could not determine which group to place first in merged \
- intracommunicator. Please use the parameter high to choose which group \
- should be placed first.
-**mx_test:mx_test failed
-**mx_test %s:mx_test failed (%s)
-**dtypenullarray:Null datatype in array of datatypes
-**dimstensor:Tensor product size does not match nnodes
-**spawnpgm %s:The program %s could not be found
-**hostlookup %d %d %s:Host lookup failed for process group %d, rank %d, business card <%s>
-**commlocalnull:Local communicator must not be MPI_COMM_NULL
-**init_vcrdup:failed to duplicate the virtual connection reference
-**sock_wait:sock_wait failed
-**invalid_handle %d %p:invalid handle (handle=%d, object=%p)
-**connrefused %d %d %s:Connection refused for process group %d, rank %d, business card <%s>
-**grapharraysize %d %d %d:Specified edge %d is %d but must be at least zero \
- and less than %d
-**init_strtok_host %s:failed to copy the hostname from this business card: %s
-**contextIdNotInUse:Context id to be freed is not in use
-**fileexist %s:File %s exists
-**filerdonly %s:Read-only file or filesystem name %s
-**notsameroot:Inconsistent root
-**wsasock %d:WSAStartup failed (errno %d)
-**contextIdInUse %d:Context id %d already in use
-**mpi_status_f2c %p %p:MPI_Status_f2c(f_status=%p, c_status=%p) failed
-**rsendnomatch %d %d %d:Ready send from source %d, for destination %d and \
- with tag %d had no matching receive
-**iocp %d:unable to create an I/O completion port (errno %d)
-**winnotinit: Attempt to use an MPI RMA function that requires an MPI Window \
- object before creating any MPI Window object
-**inet_ntop %s:inet_ntop failed - %s
-**finalize_progress:finalizing the progress engine failed
-**inet_pton:inet_pton failed
-**filenull:Null MPI_File
-**mx_wait %s:mx_wait failed (%s)
-**nomem %d %d:Out of memory (requested %d but only %d available)
-**fileamode %d:Invalid amode value of %d in MPI_File_open
-**ibu_op %d:invalid infiniband operation (%d)
-**dtypenomatch:Type signatures do not match in communication
-**shmdt:shmdt failed
-**winname:Cannot set window object name
-**multi_post_read:posting a read while a previously posted read is outstanding
-**progress_finalize:finalization of the progress engine failed
-**iofstype %s:Cannot determine filesystem type for file %s
-**keyvalnull:Null keyval
-**startup %s:Error on startup: reason is %s
-**porttimeout %s:Time out attempting an MPI_Comm_connect to a port named %s
-**invalid_listener:invalid listener
-**invalid_listener %p:invalid listener (%p)
-**invalid_shmq %p %p:invalid shm queue pointer (%p != %p)
-**freemembase:Invalid base address in MPI_Free_mem
-**spawnmanager:The process manager returned an error
-**spawnmanager %s:The process manager returned an error: %s
-**commnamelen:Specified communicator name is too long
-**commnamelen %d:Specified communicator name is too long (%d characters)
-**connallocfailed:Connection failed
-**connrefused:Connection refused
-**datarepunsupported %s:Unsupported datarep %s passed to MPI_File_set_view
-**errhandlerperm %s:Cannot free permanent error handler %s
-**filequota %s:Quota %s exceeded for files
-**intercommcoll:Intercommunicator collective operations have not been implemented
-**intercomm:Intercommunicator is not allowed
-**iosharedunsupported %s:Shared file pointers not supported on filesystem %s
-**notsamevalue %s %s:Argument %s to collective routine %s must be the same
-**othersys:System resource limit exceeded
-**pfinal_sockclose:sock_close failed
-**servicenameunpublish %s:Attempt to unpublish an unknown service name %s
-**setsockopt %s:setsockopt failed - %s
-**shmq %p %p:invalid shm queue pointer (%p != %p)
-**shmw_serbufsmall: Size of buffer to serialize shared memory handle \
-is too small (< MPIU_SHMW_GHND_SZ)
-**sock_byname:gethostbyname failed
-**sock_byname %s %d:gethostbyname failed, %s (errno %d)
-**sock_connect %d:connect failed (errno %d)
-**sock_connect %s %d %d:unable to connect to %s on port %d, error %d
-**sockw_badtvalhnd: Invalid handle to timeval
-**sockw_badwsetshnd: Invalid handle to waitSet sock handle
-**winnamelen %d:Specified window object name is too long (%d characters)
-**ch3ireadaggressive:aggressive reading failed
-**dtypename:Cannot set name in data type
-**dtypenullarray %s %d:Null datatype in array of datatypes %s[%d]
-**dev|pg_destroy_failed:attempt to destroy a process group failed
-**dev|pg_destroy_failed %p:attempt to destroy a process group failed (pg=%p)
-**pmi_kvs_get_parent %d:unable to get the PARENT_ROOT_PORT_NAME from the keyval space (pmi_error %d)
diff --git a/src/mpid/ch3/errnames-old.txt b/src/mpid/ch3/errnames-old.txt
deleted file mode 100644
index 6370c9c..0000000
--- a/src/mpid/ch3/errnames-old.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Previously used error names
-**ch3|badca %d:specified completion action in not known (%d)
-**ch3|badca:specified completion action in not known
-**ch3|canceleager:failure occurred while performing local cancellation of a eager message
-**ch3|flowcntlpkt:UNIMPLEMENTED: unable to handle flow control packets
-**ch3|get_parent_port_err_bcast:an error occurred while broadcasting the error code from MPIDI_CH3_GetParentPort()
-**ch3|get_universe_size_notimpl: MPIDI_CH3_Get_universe_size() is not implemented
-**ch3|loadrecviov %s:failure occurred while loading the receive I/O vector (%s)
-**ch3|recvdata:failure occurred while attempting to receive message data
-**ch3|recvdata %s:failure occurred while attempting to receive message data (%s)
-**ch3|unknownpkt:received unknown packet type
-**ch3|unknownpkt %d:received unknown packet type (type=%d)
diff --git a/src/mpid/ch3/util/sock/errnames-old.txt b/src/mpid/ch3/util/sock/errnames-old.txt
deleted file mode 100644
index 57d9cf4..0000000
--- a/src/mpid/ch3/util/sock/errnames-old.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# No longer used error strings
-**ch3|sock|connfailed %s %d:[ch3:sock] failed to connnect to remote process %s:%d
-**ch3|sock|pg_limit:reached the limit of process groups for spawn/connect/accept
-**ch3|sock|pgrank:rank must be less than process group size
-**ch3|sock|pgrank %d %d:pg size %d, rank passed %d
-**ch3|sock|pgrank_cache:rank must be less than process group size in the cache
-**ch3|sock|pgrank_cache %d %d:pg size in cache %d, rank passed %d
-**ch3|sock|pgsize:process group sizes don't match
-**ch3|sock|pgsize %d %d:existing pg size %d, matching pg size %d
-**ch3|sock|postwrite %p %p %p:attempt to post a write operation failed (sreq=%p,conn=%p,vc=%p)
-**ch3|sock|progress_finalize:[ch3:sock] progress_finalize failed
-**ch3|sock|strdup:[ch3:sock] MPIU_Strdup failed
-**ch3|sock|immedread %p %p %p:immediate read operation failed (rreq=%p,conn=%p,vc=%p)
-**ch3|sock|immedwrite %p %p %p:immediate write operation failed (rreq=%p,conn=%p,vc=%p)
-**ch3|sock|pg_finalize:process group finalization failed
-**ch3|sock|pgsize_cache:process group size does not match the one in the cache
-**ch3|sock|pgsize_cache %d %d:size in cache %d, size passed %d
-**ch3|sock|post_write:[ch3:sock] posting a write failed
-**ch3|sock|postread %p %p %p:attempt to post a read operation failed (rreq=%p,conn=%p,vc=%p)
diff --git a/src/mpid/common/sock/errnames-old.txt b/src/mpid/common/sock/errnames-old.txt
deleted file mode 100644
index dfb1210..0000000
--- a/src/mpid/common/sock/errnames-old.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Unused error strings
-**sock|badbuf %d %d:the supplied buffer contains invalid memory (set=%d,sock=%d)
-**sock|closed:sock has been closed locally
-**sock|connfailed %d %d:connection failure (set=%d,sock=%d)
-**sock|hostres:unable to resolve host name to an address
-**sock|osnomem %d %d:operating system routine failed due to lack of memory (set=%d,sock=%d)
-
diff --git a/src/mpid/common/sock/poll/errnames-old.txt b/src/mpid/common/sock/poll/errnames-old.txt
deleted file mode 100644
index e53dc70..0000000
--- a/src/mpid/common/sock/poll/errnames-old.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Unused error names
-**sock|poll|hostres %d %d %s:unable to resolve host name to an address (set=%d,sock=%d,host=%s)
-**sock|poll|oserror %s %d %s:unexpected operating system error from %s (errno=%d:%s)
diff --git a/src/pmi/errnames-old.txt b/src/pmi/errnames-old.txt
deleted file mode 100644
index 3c09d43..0000000
--- a/src/pmi/errnames-old.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Unused pmi error names
-**pmi_finalize:PMI_Finalize failed
-**pmi_finalize %d:PMI_Finalize returned %d
-**pmi_initialized:PMI_Initialized failed
-**pmi_initialized %d:PMI_Initialized returned %d
-**pmi_kvs_create:PMI_KVS_Create failed
-**pmi_kvs_create %d:PMI_KVS_Create returned %d
-**pmi_kvs_destroy %d:PMI_KVS_Destroy returned %d
-**pmi_kvs_get %s %s %d:PMI_KVS_Get(%s, %s) returned %d
-**pmi_kvs_iter_first:PMI_KVS_iter_first failed
-**pmi_kvs_iter_first %s %d:PMI_KVS_iter_first(%s) returned %d
-**pmi_kvs_iter_first %d:PMI_KVS_iter_first returned %d
-**pmi_kvs_iter_next %s %d:PMI_KVS_iter_next(%s) returned %d
-**pmi_kvs_put %s %s %s %d:PMI_KVS_Put(%s, %s, %s) returned %d
-**pmi_kvs_iter_next:PMI_KVS_iter_next failed
-**pmi_kvs_iter_next %d:PMI_KVS_iter_next returned %d
-----------------------------------------------------------------------
Summary of changes:
src/mpi/comm/intercomm_merge.c | 21 +--
src/mpi/errhan/errnames-old.txt | 286 ----------------------------
src/mpid/ch3/errnames-old.txt | 12 --
src/mpid/ch3/util/sock/errnames-old.txt | 19 --
src/mpid/common/sock/errnames-old.txt | 7 -
src/mpid/common/sock/poll/errnames-old.txt | 3 -
src/pmi/errnames-old.txt | 16 --
7 files changed, 9 insertions(+), 355 deletions(-)
delete mode 100644 src/mpi/errhan/errnames-old.txt
delete mode 100644 src/mpid/ch3/errnames-old.txt
delete mode 100644 src/mpid/ch3/util/sock/errnames-old.txt
delete mode 100644 src/mpid/common/sock/errnames-old.txt
delete mode 100644 src/mpid/common/sock/poll/errnames-old.txt
delete mode 100644 src/pmi/errnames-old.txt
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list