Send ghc-devs mailing list submissions to
ghc-devs@haskell.org
To subscribe or unsubscribe via the World Wide Web, visit
http://www.haskell.org/mailman/listinfo/ghc-devs
or, via email, send a message with subject or body 'help' to
ghc-devs-request@haskell.org
You can reach the person managing the list at
ghc-devs-owner@haskell.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of ghc-devs digest..."
Today's Topics:
1. Re: [commit: ghc] master: Use ffi_prep_closure_loc rather
than ffi_prep_closure (310735e) (Sergei Trofimovich)
2. Re: [commit: ghc] master: Use ffi_prep_closure_loc rather
than ffi_prep_closure (310735e) (Ian Lynagh)
3. Re: Fwd: Implemented getPageFaults for win32 (Edward Z. Yang)
----------------------------------------------------------------------
Message: 1
Date: Sun, 21 Apr 2013 21:34:31 +0300
From: Sergei Trofimovich <slyich@gmail.com>
Subject: Re: [commit: ghc] master: Use ffi_prep_closure_loc rather
than ffi_prep_closure (310735e)
To: ghc-devs@haskell.org
Cc: ghc-commits@haskell.org
Message-ID: <20130421213431.1b0ecc6c@sf>
Content-Type: text/plain; charset="us-ascii"
> commit 310735e7adce0145c653386c21686b4a1b96aea9
> Author: Ian Lynagh <ian@well-typed.com>
> Date: Sun Apr 21 16:03:40 2013 +0100
>
> Use ffi_prep_closure_loc rather than ffi_prep_closure
>
> The latter is deprecated. Part of #7718.
>
> >---------------------------------------------------------------
>
> rts/Adjustor.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rts/Adjustor.c b/rts/Adjustor.c
> index fbf95df..e4d6e8c 100644
> --- a/rts/Adjustor.c
> +++ b/rts/Adjustor.c
> @@ -131,7 +131,7 @@ createAdjustor (int cconv,
> barf("createAdjustor: failed to allocate memory");
> }
>
> - r = ffi_prep_closure(cl, cif, (void*)wptr, hptr/*userdata*/);
> + r = ffi_prep_closure_loc(cl, cif, (void*)wptr, hptr/*userdata*/, code);
> if (r != FFI_OK) barf("ffi_prep_closure failed: %d", r);
The barf() text (/ffi_prep_closure/ffi_prep_closure_loc/) might be adjusted as well.
> return (void*)code;
--
Sergei
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20130421/111d0a11/attachment-0001.pgp>
------------------------------
Message: 2
Date: Sun, 21 Apr 2013 23:36:32 +0100
From: Ian Lynagh <ian@well-typed.com>
Subject: Re: [commit: ghc] master: Use ffi_prep_closure_loc rather
than ffi_prep_closure (310735e)
To: Sergei Trofimovich <slyich@gmail.com>
Cc: ghc-devs@haskell.org
Message-ID: <20130421223632.GA3626@matrix.chaos.earth.li>
Content-Type: text/plain; charset=us-ascii
On Sun, Apr 21, 2013 at 09:34:31PM +0300, Sergei Trofimovich wrote:
> > commit 310735e7adce0145c653386c21686b4a1b96aea9
> >
> > - r = ffi_prep_closure(cl, cif, (void*)wptr, hptr/*userdata*/);
> > + r = ffi_prep_closure_loc(cl, cif, (void*)wptr, hptr/*userdata*/, code);
> > if (r != FFI_OK) barf("ffi_prep_closure failed: %d", r);
>
> The barf() text (/ffi_prep_closure/ffi_prep_closure_loc/) might be adjusted as well.
Ta, fixed.
Thanks
Ian
------------------------------
Message: 3
Date: Mon, 22 Apr 2013 01:20:08 -0700
From: "Edward Z. Yang" <ezyang@MIT.EDU>
Subject: Re: Fwd: Implemented getPageFaults for win32
To: Kyle Van Berendonck <kvanberendonck@gmail.com>
Cc: ghc-devs <ghc-devs@haskell.org>
Message-ID: <1366618780-sup-7827@javelin>
Content-Type: text/plain; charset=UTF-8
Hello Kyle,
Could you please resend this patch; it looks like when you forwarded it
it got linespace-wrapped inappropriately.
Thanks,
Edward
Excerpts from Kyle Van Berendonck's message of Sun Apr 14 16:39:49 -0700 2013:
> ---------- Forwarded message ----------
> From: Kyle Van Berendonck <kvanberendonck@gmail.com>
> Date: Sun, Apr 14, 2013 at 5:56 PM
> Subject: Implemented getPageFaults for win32
> To: ghc-devs@haskell.org
>
>
> Author: Kyle Van Berendonck <kvanberendonck@gmail.com> 2013-04-14 17:45:39
> Committer: Kyle Van Berendonck <kvanberendonck@gmail.com> 2013-04-14
> 17:45:39
> Parent: 52efb2c8aefbd448e765e62a34c3e53ab7202a11 (No need to map over all
> blocks, setting up PIC.)
> Branch: master
> Follows: ghc-darcs-git-switchover
> Precedes:
>
> Implemented getPageFaults for win32
>
> ----------------------------- rts/win32/GetTime.c
> -----------------------------
> index bfab43a..50a2c4d 100644
> @@ -157,6 +157,13 @@ W_
> getPageFaults(void)
> {
> /* ToDo (on NT): better, get this via the performance data
> - that's stored in the registry. */
> + that's stored in the registry.
> +
> + nb: this includes the number of soft page faults, but it's better
> than nothing
> + */
> + PROCESS_MEMORY_COUNTERS pmc;
> + if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc))) {
> + return pmc.PageFaultCount;
> + }
> return 0;
> }
------------------------------
_______________________________________________
ghc-devs mailing list
ghc-devs@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-devs
End of ghc-devs Digest, Vol 116, Issue 39
*****************************************