gfwleak/mesa-framework-mesa-handle-logger
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改多线程重复映射同一块共享内存，可能导致进程的线性地址耗尽问题。

Browse Source 
一个线程映射共享内存后，将地址存储，其它线程可直接使用，不用重复映射
This commit is contained in:
guo_peixu
2022-06-30 11:19:40 +08:00
parent a5bffd2fe7
commit 89899d2d0a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inc/MESA_shm_ring_queue.h
View File

@@ -16,7 +16,6 @@
#define MESA_SHM_RING_QUEUE_HALF_IDLE 2 #define MESA_SHM_RING_QUEUE_HALF_IDLE 2
#define MESA_SHM_RING_QUEUE_USED 3 #define MESA_SHM_RING_QUEUE_USED 3
#define MESA_SEM_KEY 35719
#define MESA_CONSUMER_RUNNING 1 #define MESA_CONSUMER_RUNNING 1
#define MESA_CONSUMER_NOT_RUNNING 0 #define MESA_CONSUMER_NOT_RUNNING 0

14
src/MESA_shm_ring_queue.c
View File

@@ -14,6 +14,8 @@
struct MESA_shm_overview *MESA_shm_ovw = NULL; struct MESA_shm_overview *MESA_shm_ovw = NULL;
int *MESA_consumer_status = NULL; int *MESA_consumer_status = NULL;
struct MESA_shm_queue_head *MESA_ring_queue_head[MESA_SHM_RING_QUEUE_NUM] = {NULL};
void MESA_shm_init_ring_queue_mutex(struct MESA_shm_overview *ovw) void MESA_shm_init_ring_queue_mutex(struct MESA_shm_overview *ovw)
{ {
@@ -131,15 +133,21 @@ struct MESA_shm_queue_head *MESA_shm_alloc_new_ring_queue(struct MESA_shm_overvi
} }
MESA_shm_init_new_ring_queue(head, ovw); MESA_shm_init_new_ring_queue(head, ovw);
ovw->shmid = shmid; ovw->shmid = shmid;
MESA_ring_queue_head[ovw->idx] = head;
return head; return head;
} }
struct MESA_shm_queue_head *MESA_shm_try_reuse_ring_queue(struct MESA_shm_overview *ovw) struct MESA_shm_queue_head *MESA_shm_try_reuse_ring_queue(struct MESA_shm_overview *ovw)
{ {
struct MESA_shm_queue_head *head = NULL; struct MESA_shm_queue_head *head = NULL;
head = (struct MESA_shm_queue_head *)shmat(ovw->shmid, NULL, 0); if(MESA_ring_queue_head[ovw->idx] != NULL){
if(head == (struct MESA_shm_queue_head *)-1){ head = MESA_ring_queue_head[ovw->idx];
return NULL; }else{
head = (struct MESA_shm_queue_head *)shmat(ovw->shmid, NULL, 0);
if(head == (struct MESA_shm_queue_head *)-1){
return NULL;
}
MESA_ring_queue_head[ovw->idx] = head;
} }
return head; return head;
} }