test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-30 02:47:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize epoll.c for hooking system API in fiber module.

Browse Source
This commit is contained in:
zhengshuxin 2022-03-23 16:00:31 +08:00
parent e1c6f218de
commit 4da53a2d6d
3 changed files with 91 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
lib_fiber/c/src/hook/epoll.c
View File

@ -21,14 +21,14 @@ struct EPOLL_CTX {
};
/**
* One EPOLL for each fiber is assosiate with the same one epoll fd.
* one epoll fd --> one fiber's EPOLL
* --> one fiber's EPOLL
* --> ...
* --> one fiber' sEPOLL --> socket fd's EPOLL_CTX
* --> socket fd's EPOLL_CTX
* --> socket fd's EPOLL_CTX
* --> ...
* All EPOLL_EVENT owned by its fiber are assosiate with the same one epoll fd.
* one epoll fd -|- one EPOLL -|- fiber EPOLL_EVENT
* |- fiber EPOLL_EVENT
* |- ...
* |- fiber EPOLL_EVENT -|- socket EPOLL_CTX
* |- socket EPOLL_CTX
* |- socket EPOLL_CTX
* |- ...
*/
struct EPOLL {
int epfd;
@ -58,24 +58,30 @@ static void epoll_event_free(EPOLL_EVENT *ee)
static void fiber_on_exit(void *ctx)
{
EPOLL_EVENT *ee = (EPOLL_EVENT*) ctx, *tmp;
EPOLL *ep = ee->epoll;
ACL_FIBER *curr = acl_fiber_running();
char key[32];
assert(ep);
assert(curr);
// If the epoll in ee has been set NULL in epoll_free(), the EPOLL
// must have been freed and the associated epoll fd must also have
// been closed, so we just only free the ee here.
if (ee->epoll == NULL) {
epoll_event_free(ee);
return;
}
SNPRINTF(key, sizeof(key), "%u", curr->id);
tmp = (EPOLL_EVENT *) htable_find(ep->ep_events, key);
tmp = (EPOLL_EVENT *) htable_find(ee->epoll->ep_events, key);
if (tmp == NULL) {
msg_fatal("%s(%d), %s: not found ee=%p, curr fiber=%d,"
" ee fiber=%d", __FILE__, __LINE__, __FUNCTION__, ee,
acl_fiber_id(curr), acl_fiber_id(ee->fiber));
" ee fiber=%d", __FILE__, __LINE__, __FUNCTION__,
ee, acl_fiber_id(curr), acl_fiber_id(ee->fiber));
}
assert(tmp == ee);
htable_delete(ep->ep_events, key, NULL);
htable_delete(ee->epoll->ep_events, key, NULL);
epoll_event_free(ee);
}
@ -83,6 +89,10 @@ static __thread int __local_key;
static EPOLL_EVENT *epoll_event_alloc(void)
{
// One EPOLL_EVENT can be owned by one fiber and be stored in the
// fiber's local store, so the EPOLL_EVENT can be used repeated by
// its owner fiber, and can be freed when the fiber is exiting.
EPOLL_EVENT *ee = (EPOLL_EVENT*) acl_fiber_get_specific(__local_key);
if (ee) {
return ee;
@ -199,9 +209,13 @@ static void epoll_free(EPOLL *ep)
ITER iter;
size_t i;
// Walk through all EPOLL_EVENT stored in ep_events, and just set their
// epoll variable to NULL, because they will be freed in fiber_on_exit()
// when the fiber the EPOLL_EVENT belonging to is exiting.
foreach(iter, ep->ep_events) {
EPOLL_EVENT *ee = (EPOLL_EVENT *) iter.data;
epoll_event_free(ee);
ee->epoll = NULL;
}
htable_free(ep->ep_events, NULL);
@ -216,52 +230,6 @@ static void epoll_free(EPOLL *ep)
mem_free(ep);
}
static EPOLL_EVENT *epoll_event_find(int epfd, int create)
{
ACL_FIBER *curr = acl_fiber_running();
EPOLL *ep = NULL;
EPOLL_EVENT *ee;
char key[32];
ITER iter;
if (__epfds == NULL) {
msg_error("%s(%d), %s: __epfds NULL",
__FILE__, __LINE__, __FUNCTION__);
return NULL;
}
foreach(iter, __epfds) {
EPOLL *tmp = (EPOLL *) iter.data;
if (tmp->epfd == epfd) {
ep = tmp;
break;
}
}
if (ep == NULL) {
msg_error("%s(%d, %s: not found epfd=%d",
__FILE__, __LINE__, __FUNCTION__, epfd);
return NULL;
}
SNPRINTF(key, sizeof(key), "%u", curr->id);
ee = (EPOLL_EVENT *) htable_find(ep->ep_events, key);
if (ee != NULL) {
assert(ee->epoll == ep);
return ee;
}
if (create) {
ee = epoll_event_alloc();
ee->epoll = ep;
htable_enter(ep->ep_events, key, ee);
return ee;
} else {
return NULL;
}
}
int epoll_event_close(int epfd)
{
EVENT *ev;
@ -297,6 +265,7 @@ int epoll_event_close(int epfd)
// Because we've alloced a new fd as a duplication of internal epfd
// in epoll_alloc by calling sys API dup(), the epfd here shouldn't
// be same as the internal epfd.
if (epfd == sys_epfd) {
msg_error("%s(%d): can't close the event sys_epfd=%d",
__FUNCTION__, __LINE__, epfd);
@ -309,6 +278,52 @@ int epoll_event_close(int epfd)
return (*sys_close)(epfd);
}
static EPOLL_EVENT *epoll_event_find(int epfd, int create)
{
ACL_FIBER *curr = acl_fiber_running();
EPOLL *ep = NULL;
EPOLL_EVENT *ee;
char key[32];
ITER iter;
if (__epfds == NULL) {
msg_error("%s(%d), %s: __epfds NULL",
__FILE__, __LINE__, __FUNCTION__);
return NULL;
}
foreach(iter, __epfds) {
EPOLL *tmp = (EPOLL *) iter.data;
if (tmp->epfd == epfd) {
ep = tmp;
break;
}
}
if (ep == NULL) {
msg_error("%s(%d, %s: not found epfd=%d",
__FILE__, __LINE__, __FUNCTION__, epfd);
return NULL;
}
SNPRINTF(key, sizeof(key), "%u", curr->id);
ee = (EPOLL_EVENT *) htable_find(ep->ep_events, key);
if (ee != NULL) {
ee->epoll = ep;
return ee;
}
if (create) {
ee = epoll_event_alloc();
ee->epoll = ep;
htable_enter(ep->ep_events, key, ee);
return ee;
} else {
return NULL;
}
}
/****************************************************************************/
int epoll_create(int size fiber_unused)

17
lib_fiber/samples/server5/main.cpp
View File

@ -1,6 +1,9 @@
#include "stdafx.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
static int __event_type = ACL_EVENT_KERNEL;
static bool echo(acl::socket_stream& conn)
{
@ -71,7 +74,7 @@ static void fiber_client(acl::socket_stream* conn)
printf("fiber-%d running\r\n", acl::fiber::self());
bool stop = false;
ACL_EVENT *event = acl_event_new(ACL_EVENT_POLL, 0, 1, 0);
ACL_EVENT *event = acl_event_new(__event_type, 0, 1, 0);
ACL_VSTREAM *cstream = conn->get_vstream();
cstream->context = conn;
conn->set_ctx(&stop);
@ -105,7 +108,7 @@ static void fiber_server(acl::server_socket& ss)
static void usage(const char* procname)
{
printf("usage: %s -h [help] -s listen_addr\r\n", procname);
printf("usage: %s -h [help] -s listen_addr -e event_type[kernel|poll|select]\r\n", procname);
}
int main(int argc, char *argv[])
@ -116,7 +119,7 @@ int main(int argc, char *argv[])
acl::string addr("127.0.0.1:9006");
acl::log::stdout_open(true);
while ((ch = getopt(argc, argv, "hs:")) > 0) {
while ((ch = getopt(argc, argv, "hs:e:")) > 0) {
switch (ch) {
case 'h':
usage(argv[0]);
@ -124,6 +127,14 @@ int main(int argc, char *argv[])
case 's':
addr = optarg;
break;
case 'e':
if (strcasecmp(optarg, "poll") == 0) {
__event_type = ACL_EVENT_POLL;
} else if (strcasecmp(optarg, "select") == 0) {
__event_type = ACL_EVENT_SELECT;
} else {
__event_type = ACL_EVENT_KERNEL;
}
default:
break;
}

1
lib_fiber/samples/server5/stdafx.h
View File

@ -13,6 +13,7 @@
#include "lib_acl.h"
#include "acl_cpp/lib_acl.hpp"
#include "fiber/lib_fiber.hpp"
#include "fiber/go_fiber.hpp"
#ifdef WIN32
#define snprintf _snprintf