git://scm.lunaixsky.com
/
lunaix-os.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94a87fe
1b47181
)
Merge branch 'master' into signal-dev
author
Minep
<zelong56@gmail.com>
Wed, 15 Jun 2022 20:55:55 +0000
(21:55 +0100)
committer
Minep
<zelong56@gmail.com>
Wed, 15 Jun 2022 20:55:55 +0000
(21:55 +0100)
1
2
lunaix-os/includes/lunaix/process.h
patch
|
diff1
|
diff2
|
blob
|
history
lunaix-os/includes/lunaix/syscall.h
patch
|
diff1
|
diff2
|
blob
|
history
lunaix-os/kernel/sched.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lunaix-os/includes/lunaix/process.h
index e429060ab5f785b9ffdcec9f12c6cb534bfc48aa,32b74dff5397e2fe29ce13eab3ef89ea3191f317..28cb76b97a797089cdceacac9a3323c373c0760a
---
1
/
lunaix-os/includes/lunaix/process.h
---
2
/
lunaix-os/includes/lunaix/process.h
+++ b/
lunaix-os/includes/lunaix/process.h
@@@
-40,19
-30,17
+40,21
@@@
struct proc_inf
{
pid_t pid;
struct proc_info* parent;
- isr_param intr_ctx;
+ isr_param intr_ctx; // size=76
+ uintptr_t ustack_top;
struct llist_header siblings;
struct llist_header children;
+ struct llist_header grp_member;
struct proc_mm mm;
void* page_table;
time_t created;
uint8_t state;
int32_t exit_code;
int32_t k_status;
+ sigset_t sig_pending;
+ sigset_t sig_mask;
+ void* sig_handler[_SIG_NUM];
+ pid_t pgid;
struct lx_timer* timer;
};
diff --cc
lunaix-os/includes/lunaix/syscall.h
Simple merge
diff --cc
lunaix-os/kernel/sched.c
Simple merge