Merge pull request #142 from JuliaParallel/ksh/cancel

Fix bug and add test for Cancel

Author: kshyatt

src/mpi-base.jl

@@ -456,8 +456,8 @@ function Testsome!(reqs::Array{Request,1})
     (indices, stats)
 end
 
-function Cancel!(res::Request)
-    ccall(MPI_CANCEL, Void, (Ptr{Cint},), &req.val, &0)
+function Cancel!(req::Request)
+    ccall(MPI_CANCEL, Void, (Ptr{Cint},Ptr{Cint}), &req.val, &0)
     req.buffer = nothing
     nothing
 end

src/win_mpiconstants.jl

@@ -85,5 +85,6 @@ const MPI_TYPE_COMMIT = (:MPI_TYPE_COMMIT, "msmpi.dll")
 const MPI_WAIT = (:MPI_WAIT, "msmpi.dll")
 const MPI_WAITSOME = (:MPI_WAITSOME, "msmpi.dll")
 const MPI_WAITANY = (:MPI_WAITANY, "msmpi.dll")
+const MPI_CANCEL = (:MPI_CANCEL, "msmpi.dll")
 
 bitstype 32 CComm

test/test_sendrecv.jl

@@ -106,4 +106,10 @@ rreq = nothing
 sreq = nothing
 gc()
 
+recv_mesg = Array(Float64, N)
+sreq = MPI.Isend(send_mesg, dst, rank+32, comm)
+MPI.Cancel!(sreq)
+@test sreq.buffer == nothing
+gc()
+
 MPI.Finalize()