cmhi
/
f-stack
mirror of https://github.com/F-Stack/f-stack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some issue that check the return value of sem_timedwait.

This commit is contained in:
fengbojiang 2023-04-11 17:51:34 +08:00
parent 8766cedde1
commit 1d09ad5003
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
adapter/ff_hook_syscall.c
View File

@ -1233,6 +1233,7 @@ ff_hook_epoll_wait(int epfd, struct epoll_event *events,
sc->args = args;
RELEASE_ZONE_LOCK(FF_SC_REQ);
errno = 0;
if (timeout > 0) {
struct timespec abs_timeout;
@ -1256,11 +1257,16 @@ ff_hook_epoll_wait(int epfd, struct epoll_event *events,
rte_spinlock_lock(&sc->lock);
if (ret == -1 && sc->status == FF_SC_REQ) {
if (errno == ETIMEDOUT) {
ret = 0;
}
} else {
/*
* After sem_timedwait, and before lock sc, sc->status may be modify from FF_SC_REQ to FF_SC_RSP,
* so it can't use to check.
*
* And only ret == 0, means sem_timedwait return normal,
* can set ret = sc->result, otherwise may use last sc->result.
*/
if (ret == -1 && errno == ETIMEDOUT /* sc->status == FF_SC_REQ */) {
ret = 0;
} else if (ret == 0) {
ret = sc->result;
if (ret < 0) {
errno = sc->error;
@ -1272,6 +1278,11 @@ ff_hook_epoll_wait(int epfd, struct epoll_event *events,
if (ret > 0) {
int i;
if (unlikely(ret > maxevents)) {
ERR_LOG("return events:%d, maxevents:%d, set return events to maxevents, may be some error occur\n",
ret, maxevents);
ret = maxevents;
}
for (i = 0; i < ret; i++) {
rte_memcpy(&events[i], &sh_events[i], sizeof(struct epoll_event));
}
@ -1319,6 +1330,7 @@ kevent(int kq, const struct kevent *changelist, int nchanges,
const struct timespec *timeout)
{
int i;
int maxevents = nevents;
struct kevent *kev;
DEBUG_LOG("kq:%d, nchanges:%d, nevents:%d\n", kq, nchanges, nevents);
@ -1397,11 +1409,16 @@ kevent(int kq, const struct kevent *changelist, int nchanges,
rte_spinlock_lock(&sc->lock);
if (ret == -1 && sc->status == FF_SC_REQ) {
if (errno == ETIMEDOUT) {
ret = 0;
}
} else {
/*
* After sem_timedwait, and before lock sc, sc->status may be modify from FF_SC_REQ to FF_SC_RSP,
* so it can't use to check.
*
* And only ret == 0, means sem_timedwait return normal,
* can set ret = sc->result, otherwise may use last sc->result.
*/
if (ret == -1 && errno == ETIMEDOUT /* sc->status == FF_SC_REQ */) {
ret = 0;
} else if (ret == 0) {
ret = sc->result;
if (ret < 0) {
errno = sc->error;
@ -1414,6 +1431,11 @@ kevent(int kq, const struct kevent *changelist, int nchanges,
if (ret > 0) {
if (eventlist && nevents) {
if (unlikely(nevents > maxevents)) {
ERR_LOG("return events:%d, maxevents:%d, set return events to maxevents, may be some error occur\n",
nevents, maxevents);
nevents = maxevents;
}
rte_memcpy(eventlist, sh_eventlist,
sizeof(struct kevent) * ret);

6
adapter/ff_socket_ops.h
View File

@ -39,7 +39,7 @@ enum FF_SOCKET_OPS {
FF_SO_GETSOCKOPT,
FF_SO_SETSOCKOPT,
FF_SO_ACCEPT,
FF_SO_ACCEPT4,
FF_SO_ACCEPT4, // 10
FF_SO_RECV,
FF_SO_RECVFROM,
FF_SO_RECVMSG,
@ -49,7 +49,7 @@ enum FF_SOCKET_OPS {
FF_SO_SENDTO,
FF_SO_SENDMSG,
FF_SO_WRITE,
FF_SO_WRITEV,
FF_SO_WRITEV, // 20
FF_SO_CLOSE,
FF_SO_IOCTL,
FF_SO_FCNTL,
@ -58,7 +58,7 @@ enum FF_SOCKET_OPS {
FF_SO_EPOLL_WAIT,
FF_SO_KQUEUE,
FF_SO_KEVENT,
FF_SO_FORK,
FF_SO_FORK, // 29
};
enum FF_SO_CONTEXT_STATUS {