simplify msmpi stdcall logic (#366)

Author: simonbyrne

src/environment.jl

@@ -254,19 +254,11 @@ function Finalized()
 end
 
 function Wtick()
-    @static if MPI_LIBRARY == MicrosoftMPI
-        ccall((:MPI_Wtick, libmpi), stdcall, Cdouble, ())
-    else
-        ccall((:MPI_Wtick, libmpi), Cdouble, ())
-    end
+    @mpicall ccall((:MPI_Wtick, libmpi), Cdouble, ())
 end
 
 function Wtime()
-    @static if MPI_LIBRARY == MicrosoftMPI
-        ccall((:MPI_Wtime, libmpi), stdcall, Cdouble, ())
-    else
-        ccall((:MPI_Wtime, libmpi), Cdouble, ())
-    end
+    @mpicall ccall((:MPI_Wtime, libmpi), Cdouble, ())
 end
 
 

src/error.jl

@@ -3,10 +3,7 @@ struct MPIError <: Exception
 end
 
 macro mpichk(expr)
-    @assert expr isa Expr && expr.head == :call && expr.args[1] == :ccall
-    if MPI_LIBRARY == MicrosoftMPI
-        insert!(expr.args, 3, :stdcall)
-    end
+    expr = macroexpand(@__MODULE__, :(@mpicall($expr)))
     :((errcode = $(esc(expr))) == MPI_SUCCESS || throw(MPIError(errcode)))
 end
 

src/implementations.jl

@@ -7,13 +7,8 @@ function Get_library_version()
     buf = Array{UInt8}(undef, 8192)
     buflen = Ref{Cint}()
 
-    # Microsoft MPI uses stdcall calling convention
     libfilename, = split(basename(libmpi),'.')
-    if libfilename == "msmpi"
-        ccall((:MPI_Get_library_version, libmpi), stdcall, Cint, (Ptr{UInt8}, Ref{Cint}), buf, buflen)
-    else
-        ccall((:MPI_Get_library_version, libmpi), Cint, (Ptr{UInt8}, Ref{Cint}), buf, buflen)
-    end
+    @mpicall ccall((:MPI_Get_library_version, libmpi), Cint, (Ptr{UInt8}, Ref{Cint}), buf, buflen)
     resize!(buf, buflen[])
     return String(buf)
 end
@@ -190,13 +185,8 @@ MPI_LIBRARY_ABI
 function Get_version()
     major = Ref{Cint}()
     minor = Ref{Cint}()
-    if MPI_LIBRARY == MicrosoftMPI
-        ccall((:MPI_Get_version, libmpi), stdcall, Cint,
-              (Ptr{Cint}, Ptr{Cint}), major, minor)
-    else
-        ccall((:MPI_Get_version, libmpi), Cint,
-              (Ptr{Cint}, Ptr{Cint}), major, minor)
-    end
+    @mpicall ccall((:MPI_Get_version, libmpi), Cint,
+                   (Ptr{Cint}, Ptr{Cint}), major, minor)
     VersionNumber(major[], minor[])
 end
 

src/paths.jl

@@ -65,3 +65,18 @@ function mpiexec(fn)
     mpiexec_args = Base.shell_split(get(ENV, "JULIA_MPIEXEC_ARGS", ""))
     fn(`$mpiexec_path $mpiexec_args`)
 end
+
+
+const use_stdcall = startswith(basename(libmpi), "msmpi")
+
+macro mpicall(expr)
+    @assert expr isa Expr && expr.head == :call && expr.args[1] == :ccall
+    # Microsoft MPI uses stdcall calling convention
+    # this only affects 32-bit Windows
+    # unfortunately we need to use ccall to call Get_library_version
+    # so check using library name instead
+    if use_stdcall
+        insert!(expr.args, 3, :stdcall)
+    end
+    return esc(expr)
+end