Merge branch 'windows-build'

Co-authored-by: Valentin Churavy <v.churavy@gmail.com>

Author: NHDaly

.appveyor.yml

@@ -42,4 +42,3 @@ test_script:
 # on_success:
 #   - echo "%JL_CODECOV_SCRIPT%"
 #   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
-

Project.toml

@@ -1,7 +1,7 @@
 name = "PProf"
 uuid = "e4faabce-9ead-11e9-39d9-4379958e3056"
 authors = ["Valentin Churavy <v.churavy@gmail.com>", "Nathan Daly <nhdaly@gmail.com>"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"

deps/build.jl

@@ -7,7 +7,7 @@ const verbose = "--verbose" in ARGS
 const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
 
 # Instantiate products:
-go_pprof = ExecutableProduct(prefix, "pprof", :go_pprof)
+go_pprof = ExecutableProduct(prefix, Sys.iswindows() ? "pprof.exe" : "pprof", :go_pprof)
 products = [go_pprof]
 
 # Download binaries from hosted location
@@ -27,8 +27,8 @@ download_info = Dict(
 
     BinaryProvider.MacOS(:x86_64)          => ("$bin_prefix/pprof_darwin_amd64.tar.gz", "93f5c227af23ade110fedbd07eff0bd57644fec0cde77ad359515bb254c43802"),
 
-    BinaryProvider.Windows(:i686)          => ("$bin_prefix/pprof_windows_386.exe.tar.gz", "90a343e9ae8888c0f52322761dc028d9c7edf4a202e81aea2989ac182e77010c"),
-    BinaryProvider.Windows(:x86_64)        => ("$bin_prefix/pprof_windows_amd64.exe.tar.gz", "21702d1f7317d969a283d094898e92ba3da4961c419c5351d359f3abf0894d43"),
+    BinaryProvider.Windows(:i686)          => ("$bin_prefix/pprof_windows_386.tar.gz", "90a343e9ae8888c0f52322761dc028d9c7edf4a202e81aea2989ac182e77010c"),
+    BinaryProvider.Windows(:x86_64)        => ("$bin_prefix/pprof_windows_amd64.tar.gz", "21702d1f7317d969a283d094898e92ba3da4961c419c5351d359f3abf0894d43"),
 )
 
 # First, check to see if we're all satisfied
@@ -37,11 +37,13 @@ if any(!satisfied(p; verbose=verbose) for p in products)
         # Download and install binaries
         url, tarball_hash = choose_download(download_info)
         install(url, tarball_hash; prefix=prefix, force=true, verbose=true)
-        # NHDALY MANUALLY ADDED THESE LINES TO HOOK UP THE BINARY
-        bin = mkpath(joinpath(prefix, "bin"))
-        dir = splitext(splitext(basename(url))[1])[1]
-        @show dir
-        cp(joinpath(prefix, dir, "pprof"), joinpath(bin, "pprof"))
+        # we need to move the unpacked binary from `prefix` to `prefix/bin`
+        dir        = splitext(splitext(basename(url))[1])[1]
+        destpath   = dirname(go_pprof.path)
+        binaryname = basename(go_pprof.path)
+
+        mkpath(destpath)
+        cp(joinpath(prefix, dir, binaryname), go_pprof.path)
     catch e
         if typeof(e) <: ArgumentError
             error("Your platform $(Sys.MACHINE) is not supported by this package!")

src/PProf.jl

@@ -9,7 +9,7 @@ using OrderedCollections
 # Load in `deps.jl`, complaining if it does not exist
 const depsjl_path = joinpath(@__DIR__, "..", "deps", "deps.jl")
 if !isfile(depsjl_path)
-    error("LibFoo not installed properly, run Pkg.build(\"LibFoo\"), restart Julia and try again")
+    error("PProf not installed properly, run Pkg.build(\"PProf\"), restart Julia and try again")
 end
 include(depsjl_path)
 
@@ -27,16 +27,19 @@ import .perftools.profiles: ValueType, Sample, Function,
 const PProfile = perftools.profiles.Profile
 
 """
-    _enter!(dict::OrderedDict{T, Int}, key::T) where T
+    _enter!(dict::OrderedDict{T, Int64}, key::T) where T
 
 Resolves from `key` to the index (zero-based) in the dict.
 Useful for the Strings table
+
+NOTE: We must use Int64 throughout this package (regardless of system word-size) b/c the
+proto file specifies 64-bit integers.
 """
-function _enter!(dict::OrderedDict{T, Int}, key::T) where T
+function _enter!(dict::OrderedDict{T, Int64}, key::T) where T
     if haskey(dict, key)
         return dict[key]
     else
-        l = length(dict)
+        l = Int64(length(dict))
         dict[key] = l
         return l
     end
@@ -84,7 +87,7 @@ function pprof(data::Union{Nothing, Vector{UInt}} = nothing,
         period = ccall(:jl_profile_delay_nsec, UInt64, ())
     end
 
-    string_table = OrderedDict{AbstractString, Int}()
+    string_table = OrderedDict{AbstractString, Int64}()
     enter!(string) = _enter!(string_table, string)
     enter!(::Nothing) = _enter!(string_table, "nothing")
     ValueType!(_type, unit) = ValueType(_type = enter!(_type), unit = enter!(unit))