Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
b6980f41
Commit
b6980f41
authored
Jun 11, 2012
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed memory leak in fiber implementation
parent
ca4c9147
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
21 deletions
+8
-21
src/fiber.cpp
src/fiber.cpp
+8
-21
No files found.
src/fiber.cpp
View file @
b6980f41
...
@@ -55,19 +55,6 @@ namespace {
...
@@ -55,19 +55,6 @@ namespace {
constexpr
size_t
s_stack_size
=
SIGSTKSZ
;
constexpr
size_t
s_stack_size
=
SIGSTKSZ
;
inline
void
*
get_stack
()
{
return
mmap
(
0
,
s_stack_size
,
PROT_EXEC
|
PROT_READ
|
PROT_WRITE
,
MAP_PRIVATE
|
MAP_ANON
,
-
1
,
0
);
}
inline
void
release_stack
(
void
*
mem
)
{
munmap
(
mem
,
s_stack_size
);
}
typedef
void
(
*
void_function
)();
typedef
void
(
*
void_function
)();
typedef
void
(
*
void_ptr_function
)(
void
*
);
typedef
void
(
*
void_ptr_function
)(
void
*
);
...
@@ -124,9 +111,9 @@ namespace cppa { namespace util {
...
@@ -124,9 +111,9 @@ namespace cppa { namespace util {
struct
fiber_impl
{
struct
fiber_impl
{
bool
m_initialized
;
bool
m_initialized
;
void
*
m_stack
;
void
(
*
m_func
)(
void
*
);
void
(
*
m_func
)(
void
*
);
void
*
m_arg
;
void
*
m_arg
;
void
*
m_stack
;
# ifdef __APPLE__
# ifdef __APPLE__
// ucontext implementation on macosx kinda sucks
// ucontext implementation on macosx kinda sucks
...
@@ -139,16 +126,16 @@ struct fiber_impl {
...
@@ -139,16 +126,16 @@ struct fiber_impl {
inline
ucontext_t
*
ctx
()
{
return
&
m_ctx
;
}
inline
ucontext_t
*
ctx
()
{
return
&
m_ctx
;
}
# endif
# endif
fiber_impl
()
throw
()
:
m_initialized
(
true
),
m_
stack
(
0
),
m_func
(
0
),
m_arg
(
0
)
{
fiber_impl
()
throw
()
:
m_initialized
(
true
),
m_
func
(
0
),
m_arg
(
0
),
m_stack
(
0
)
{
memset
(
ctx
(),
0
,
ucontext_size
);
memset
(
ctx
(),
0
,
ucontext_size
);
getcontext
(
ctx
());
getcontext
(
ctx
());
}
}
fiber_impl
(
void
(
*
func
)(
void
*
),
void
*
arg
)
fiber_impl
(
void
(
*
func
)(
void
*
),
void
*
arg
)
:
m_initialized
(
false
)
:
m_initialized
(
false
)
,
m_stack
(
nullptr
)
,
m_func
(
func
)
,
m_func
(
func
)
,
m_arg
(
arg
)
,
m_arg
(
arg
)
{
,
m_stack
(
nullptr
)
{
}
}
inline
void
swap
(
fiber_impl
*
to
)
{
inline
void
swap
(
fiber_impl
*
to
)
{
...
@@ -159,7 +146,7 @@ struct fiber_impl {
...
@@ -159,7 +146,7 @@ struct fiber_impl {
m_initialized
=
true
;
m_initialized
=
true
;
memset
(
ctx
(),
0
,
ucontext_size
);
memset
(
ctx
(),
0
,
ucontext_size
);
getcontext
(
ctx
());
getcontext
(
ctx
());
m_stack
=
get_stack
(
);
m_stack
=
malloc
(
s_stack_size
);
ctx
()
->
uc_stack
.
ss_sp
=
m_stack
;
ctx
()
->
uc_stack
.
ss_sp
=
m_stack
;
ctx
()
->
uc_stack
.
ss_size
=
s_stack_size
;
ctx
()
->
uc_stack
.
ss_size
=
s_stack_size
;
ctx
()
->
uc_link
=
nullptr
;
ctx
()
->
uc_link
=
nullptr
;
...
@@ -171,7 +158,7 @@ struct fiber_impl {
...
@@ -171,7 +158,7 @@ struct fiber_impl {
}
}
~
fiber_impl
()
{
~
fiber_impl
()
{
if
(
m_stack
)
release_stack
(
m_stack
);
if
(
m_stack
)
free
(
m_stack
);
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment