Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
00dc2660
Commit
00dc2660
authored
Oct 29, 2013
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restorer: Remove unused heap
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
b33fa025
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
cr-restore.c
cr-restore.c
+1
-2
restorer.h
include/restorer.h
+0
-5
restorer.c
pie/restorer.c
+2
-2
No files found.
cr-restore.c
View file @
00dc2660
...
...
@@ -2522,9 +2522,8 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
if
(
thread_args
[
i
].
pid
!=
pid
)
core_entry__free_unpacked
(
tcore
,
NULL
);
pr_info
(
"Thread %4d stack %8p
heap %8p
rt_sigframe %8p
\n
"
,
pr_info
(
"Thread %4d stack %8p rt_sigframe %8p
\n
"
,
i
,
thread_args
[
i
].
mem_zone
.
stack
,
thread_args
[
i
].
mem_zone
.
heap
,
thread_args
[
i
].
mem_zone
.
rt_sigframe
);
}
...
...
include/restorer.h
View file @
00dc2660
...
...
@@ -42,7 +42,6 @@ typedef long (*thread_restore_fcall_t) (struct thread_restore_args *args);
/* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */
#define RESTORE_STACK_SIGFRAME ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_OFFSET, 64)
#define RESTORE_STACK_SIZE (KILO(32))
#define RESTORE_HEAP_SIZE (KILO(16))
#define RESTORE_ALIGN_STACK(start, size) \
(ALIGN((start) + (size) - sizeof(long), sizeof(long)))
...
...
@@ -51,12 +50,8 @@ struct restore_mem_zone {
u8
redzone
[
RESTORE_STACK_REDZONE
];
u8
stack
[
RESTORE_STACK_SIZE
];
u8
rt_sigframe
[
RESTORE_STACK_SIGFRAME
];
u8
heap
[
RESTORE_HEAP_SIZE
];
}
__aligned
(
sizeof
(
long
));
#define first_on_heap(ptr, heap) ((typeof(ptr))heap)
#define next_on_heap(ptr, prev) ((typeof(ptr))((long)(prev) + sizeof(*(prev))))
struct
rst_sched_param
{
int
policy
;
int
nice
;
...
...
pie/restorer.c
View file @
00dc2660
...
...
@@ -791,14 +791,14 @@ long __export_restore_task(struct task_restore_core_args *args)
*
* | <-- low addresses high addresses --> |
* +-------------------------------------------------------+-----------------------+
* | this proc body | own stack |
heap |
rt_sigframe space | thread restore zone |
* | this proc body | own stack | rt_sigframe space | thread restore zone |
* +-------------------------------------------------------+-----------------------+
*
* where each thread restore zone is the following
*
* | <-- low addresses high addresses --> |
* +--------------------------------------------------------------------------+
* | thread restore proc | thread1 stack | thread1
heap | thread1
rt_sigframe |
* | thread restore proc | thread1 stack | thread1 rt_sigframe |
* +--------------------------------------------------------------------------+
*/
...
...
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