Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
unix
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
unix
Commits
72774b03
Commit
72774b03
authored
9 years ago
by
Herbert Valerio Riedel
Browse files
Options
Downloads
Patches
Plain Diff
Use more direct CApiFFI for pPrPr_disableITimers
parent
27963615
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
System/Posix/Process/Internals.hs
+1
-2
1 addition, 2 deletions
System/Posix/Process/Internals.hs
cbits/ghcrts.c
+0
-15
0 additions, 15 deletions
cbits/ghcrts.c
include/execvpe.h
+0
-3
0 additions, 3 deletions
include/execvpe.h
unix.cabal
+0
-1
0 additions, 1 deletion
unix.cabal
with
1 addition
and
21 deletions
System/Posix/Process/Internals.hs
+
1
−
2
View file @
72774b03
{-# LANGUAGE CApiFFI #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE Trustworthy #-}
module
System.Posix.Process.Internals
(
...
...
@@ -26,7 +25,7 @@ data ProcessStatus
-- this function disables the itimer, which would otherwise cause confusing
-- signals to be sent to the new process.
foreign
import
c
call
unsafe
"
pPrPr_disableI
Timer
s
"
foreign
import
c
api
unsafe
"
Rts.h stop
Timer"
pPrPr_disableITimers
::
IO
()
foreign
import
ccall
unsafe
"__hsunix_execvpe"
...
...
This diff is collapsed.
Click to expand it.
cbits/ghcrts.c
deleted
100644 → 0
+
0
−
15
View file @
27963615
#ifdef __GLASGOW_HASKELL__
// for 'void StopTimer(void)' prototype
# include "Rts.h"
#endif
#define HSUNIX_EXECVPE_H_NO_COMPAT
#include
"execvpe.h"
/* Copied verbatim from ghc/lib/std/cbits/system.c. */
void
pPrPr_disableITimers
(
void
)
{
#ifdef __GLASGOW_HASKELL__
stopTimer
();
#endif
}
This diff is collapsed.
Click to expand it.
include/execvpe.h
+
0
−
3
View file @
72774b03
...
...
@@ -22,7 +22,4 @@ execvpe(const char *name, char *const argv[], char *const envp[]);
#endif
#endif
// implemented in cbits/ghcrts.c
extern
void
pPrPr_disableITimers
(
void
);
#endif
This diff is collapsed.
Click to expand it.
unix.cabal
+
0
−
1
View file @
72774b03
...
...
@@ -133,4 +133,3 @@ library
cbits/HsUnix.c
cbits/dirUtils.c
cbits/execvpe.c
cbits/ghcrts.c
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment