espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-28 21:03:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/lwip_use_thread_saft_and_thread_sync' into 'master'

Browse Source 
Add multi-thread support

See merge request sdk/ESP8266_RTOS_SDK!239
This commit is contained in:
Wu Jian Gang
2018-06-29 11:46:40 +08:00
parent da55e656ab e912bc25fa
commit 2dee4bc59f
7 changed files with 349 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

423
components/lwip/apps/multi-threads/sockets_mt.c
View File

@ -4,18 +4,24 @@
#ifdef SOCKETS_MT #ifdef SOCKETS_MT
#include "../../lwip/src/api/sockets.c" #include "../../lwip/src/api/sockets.c"
#include "lwip/priv/api_msg.h"
#ifndef LWIP_SYNC_MT_SLEEP_MS #ifndef LWIP_SYNC_MT_SLEEP_MS
#define LWIP_SYNC_MT_SLEEP_MS 10 #define LWIP_SYNC_MT_SLEEP_MS 10
#endif #endif
#ifndef SOCK_MT_DEBUG_LEVEL #ifndef SOCK_MT_DEBUG_LEVEL
#define SOCK_MT_DEBUG_LEVEL 255 #define SOCK_MT_DEBUG_LEVEL 255
#endif #endif
typedef int (*lwip_io_mt_fn)(int , int ); typedef struct socket_conn_sync {
sys_sem_t *sem;
struct netconn *conn;
} socket_conn_sync_t;
enum sock_mt_stat{ typedef int (*lwip_io_mt_fn)(int, int );
enum sock_mt_stat {
SOCK_MT_STATE_NONE = 0, SOCK_MT_STATE_NONE = 0,
SOCK_MT_STATE_BIND, SOCK_MT_STATE_BIND,
SOCK_MT_STATE_LISTEN, SOCK_MT_STATE_LISTEN,
@ -63,11 +69,11 @@ struct _sock_mt {
typedef struct _sock_mt sock_mt_t; typedef struct _sock_mt sock_mt_t;
#if (SOCK_MT_DEBUG_LEVEL < 16) #if (SOCK_MT_DEBUG_LEVEL < 16)
#define SOCK_MT_DEBUG(level, ...) \ #define SOCK_MT_DEBUG(level, ...) \
if (level >= SOCK_MT_DEBUG_LEVEL) \ if (level >= SOCK_MT_DEBUG_LEVEL) \
printf(__VA_ARGS__); printf(__VA_ARGS__);
#else #else
#define SOCK_MT_DEBUG(level, ...) #define SOCK_MT_DEBUG(level, ...)
#endif #endif
#if 0 #if 0
@ -252,9 +258,9 @@ static sock_mt_t sockets_mt[NUM_SOCKETS];
static int lwip_enter_mt_state(int s, int arg) static int lwip_enter_mt_state(int s, int arg)
{ {
if(tryget_socket(s) == NULL || if (tryget_socket(s) == NULL ||
SOCK_MT_GET_STATE(s) != SOCK_MT_STATE_NONE || SOCK_MT_GET_STATE(s) != SOCK_MT_STATE_NONE ||
SOCK_MT_GET_WRITE_SEL(s)) SOCK_MT_GET_WRITE_SEL(s))
return -1; return -1;
SOCK_MT_LOCK(s, SOCK_MT_STATE_LOCK); SOCK_MT_LOCK(s, SOCK_MT_STATE_LOCK);
@ -265,181 +271,181 @@ static int lwip_enter_mt_state(int s, int arg)
static int lwip_enter_mt_recv(int s, int arg) static int lwip_enter_mt_recv(int s, int arg)
{ {
if(tryget_socket(s) == NULL || if (tryget_socket(s) == NULL ||
SOCK_MT_GET_READ_SEL(s)) SOCK_MT_GET_READ_SEL(s))
return -1; return -1;
SOCK_MT_LOCK(s, SOCK_MT_RECV_LOCK); SOCK_MT_LOCK(s, SOCK_MT_RECV_LOCK);
return 0; return 0;
} }
static int lwip_enter_mt_shutdown(int s, int arg) static int lwip_enter_mt_shutdown(int s, int arg)
{ {
if(tryget_socket(s) == NULL if (tryget_socket(s) == NULL
|| SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) || SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE)
return -1; return -1;
SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_SHUTDOWN_OK); SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_SHUTDOWN_OK);
return 0; return 0;
} }
static int lwip_enter_mt_close(int s, int arg) static int lwip_enter_mt_close(int s, int arg)
{ {
if(tryget_socket(s) == NULL) if (tryget_socket(s) == NULL)
return -1; return -1;
SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_SHUTDOWN_OK); SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_SHUTDOWN_OK);
return 0; return 0;
} }
static int lwip_enter_mt_select(int s, int arg) static int lwip_enter_mt_select(int s, int arg)
{ {
int i; int i;
int *fdset = (int *)arg; int *fdset = (int *)arg;
fd_set *read_set = (fd_set *)fdset[0]; fd_set *read_set = (fd_set *)fdset[0];
fd_set *write_set = (fd_set *)fdset[1]; fd_set *write_set = (fd_set *)fdset[1];
if (s > NUM_SOCKETS || s < 0) if (s > NUM_SOCKETS || s < 0)
return -1; return -1;
for (i = 0; i < s; i++) { for (i = 0; i < s; i++) {
if(FD_ISSET(i, read_set) || FD_ISSET(i, write_set)) if(FD_ISSET(i, read_set) || FD_ISSET(i, write_set))
if (tryget_socket(i) == NULL) if (tryget_socket(i) == NULL)
goto failed1; goto failed1;
if (FD_ISSET(i, read_set)) { if (FD_ISSET(i, read_set)) {
err_t err; err_t err;
SOCK_MT_SET_READ_SEL(i); SOCK_MT_SET_READ_SEL(i);
SOCK_MT_LOCK_RET(i, SOCK_MT_RECV_LOCK, err); SOCK_MT_LOCK_RET(i, SOCK_MT_RECV_LOCK, err);
if (err != ERR_OK) { if (err != ERR_OK) {
goto failed2; goto failed2;
} }
} }
if (FD_ISSET(i, write_set)) { if (FD_ISSET(i, write_set)) {
err_t err; err_t err;
SOCK_MT_SET_WRITE_SEL(i); SOCK_MT_SET_WRITE_SEL(i);
SOCK_MT_LOCK_RET(i, SOCK_MT_STATE_LOCK, err); SOCK_MT_LOCK_RET(i, SOCK_MT_STATE_LOCK, err);
if (err != ERR_OK) { if (err != ERR_OK) {
goto failed3; goto failed3;
} }
} }
} }
return 0; return 0;
failed3: failed3:
SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK);
SOCK_MT_RESET_WRITE_SEL(i); SOCK_MT_RESET_WRITE_SEL(i);
failed2: failed2:
if (FD_ISSET(i, read_set)) { if (FD_ISSET(i, read_set)) {
SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK);
SOCK_MT_RESET_READ_SEL(i); SOCK_MT_RESET_READ_SEL(i);
} }
failed1: failed1:
for (i--; i >=0; i--) { for (i--; i >=0; i--) {
if (FD_ISSET(i, read_set) ){ if (FD_ISSET(i, read_set) ) {
SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK);
SOCK_MT_RESET_READ_SEL(i); SOCK_MT_RESET_READ_SEL(i);
} }
if (FD_ISSET(i, write_set)) { if (FD_ISSET(i, write_set)) {
SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK);
SOCK_MT_RESET_WRITE_SEL(i); SOCK_MT_RESET_WRITE_SEL(i);
} }
} }
return -1; return -1;
} }
static int lwip_enter_mt_ioctrl(int s, int arg) static int lwip_enter_mt_ioctrl(int s, int arg)
{ {
if(tryget_socket(s) == NULL) if (tryget_socket(s) == NULL)
return -1; return -1;
SOCK_MT_LOCK(s, SOCK_MT_IOCTRL_LOCK); SOCK_MT_LOCK(s, SOCK_MT_IOCTRL_LOCK);
return 0; return 0;
} }
static int lwip_exit_mt_state(int s, int arg) static int lwip_exit_mt_state(int s, int arg)
{ {
SOCK_MT_SET_STATE(s, SOCK_MT_STATE_NONE); SOCK_MT_SET_STATE(s, SOCK_MT_STATE_NONE);
SOCK_MT_UNLOCK(s, SOCK_MT_STATE_LOCK); SOCK_MT_UNLOCK(s, SOCK_MT_STATE_LOCK);
if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) { if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) {
return -1; return -1;
} }
return 0; return 0;
} }
static int lwip_exit_mt_recv(int s, int arg) static int lwip_exit_mt_recv(int s, int arg)
{ {
SOCK_MT_UNLOCK(s, SOCK_MT_RECV_LOCK); SOCK_MT_UNLOCK(s, SOCK_MT_RECV_LOCK);
if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) { if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) {
return -1; return -1;
} }
return 0; return 0;
} }
static int lwip_exit_mt_shutdown(int s, int arg) static int lwip_exit_mt_shutdown(int s, int arg)
{ {
//SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_STATE_NONE); //SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_STATE_NONE);
return 0; return 0;
} }
static int lwip_exit_mt_close(int s, int arg) static int lwip_exit_mt_close(int s, int arg)
{ {
return 0; return 0;
} }
static int lwip_exit_mt_select(int s, int arg) static int lwip_exit_mt_select(int s, int arg)
{ {
int i; int i;
int *fdset = (int *)arg; int *fdset = (int *)arg;
fd_set *read_set = (fd_set *)fdset[0]; fd_set *read_set = (fd_set *)fdset[0];
fd_set *write_set = (fd_set *)fdset[1]; fd_set *write_set = (fd_set *)fdset[1];
for (i = 0; i < s; i++) { for (i = 0; i < s; i++) {
if (FD_ISSET(i, read_set)) { if (FD_ISSET(i, read_set)) {
SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_RECV_LOCK);
SOCK_MT_RESET_READ_SEL(i); SOCK_MT_RESET_READ_SEL(i);
} }
if (FD_ISSET(i, write_set)) { if (FD_ISSET(i, write_set)) {
SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK); SOCK_MT_UNLOCK(i, SOCK_MT_STATE_LOCK);
SOCK_MT_RESET_WRITE_SEL(i); SOCK_MT_RESET_WRITE_SEL(i);
} }
} }
for (i = 0; i < s; i++) { for (i = 0; i < s; i++) {
if ((FD_ISSET(i, read_set) || FD_ISSET(i, write_set)) \ if ((FD_ISSET(i, read_set) || FD_ISSET(i, write_set)) \
&& SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) { && SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) {
return -1; return -1;
} }
} }
return 0; return 0;
} }
static int lwip_exit_mt_ioctrl(int s, int arg) static int lwip_exit_mt_ioctrl(int s, int arg)
{ {
SOCK_MT_UNLOCK(s, SOCK_MT_IOCTRL_LOCK); SOCK_MT_UNLOCK(s, SOCK_MT_IOCTRL_LOCK);
if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) { if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) {
return -1; return -1;
} }
return 0; return 0;
} }
static const lwip_io_mt_fn lwip_enter_mt_table[] = { static const lwip_io_mt_fn lwip_enter_mt_table[] = {
@ -462,7 +468,8 @@ static const lwip_io_mt_fn lwip_exit_mt_table[] = {
static void lwip_do_sync_send(void *arg) static void lwip_do_sync_send(void *arg)
{ {
struct netconn *conn = arg; socket_conn_sync_t *sync = (socket_conn_sync_t *)arg;
struct netconn *conn = sync->conn;
SYS_ARCH_DECL_PROTECT(lev); SYS_ARCH_DECL_PROTECT(lev);
SYS_ARCH_PROTECT(lev); SYS_ARCH_PROTECT(lev);
@ -472,118 +479,119 @@ static void lwip_do_sync_send(void *arg)
} }
conn->state = NETCONN_NONE; conn->state = NETCONN_NONE;
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
if (sys_sem_valid(&(conn->snd_op_completed)))
sys_sem_signal(&(conn->snd_op_completed));
/* sys_sem_signal(sync->sem);
* if we use "op_completed" for its sync semaphore, then socket functions
* which are blocked by op_completed will be waked up.
*
* So we had better use a specific semaphore for the function, ioctrl_completed
* may be a good choise.
*/
sys_sem_signal(&(conn->ioctrl_completed));
} }
static void lwip_do_sync_rst_state(void *arg) static void lwip_do_sync_rst_state(void *arg)
{ {
struct netconn *conn = arg; socket_conn_sync_t *sync = (socket_conn_sync_t *)arg;
struct netconn *conn = sync->conn;
SYS_ARCH_DECL_PROTECT(lev); SYS_ARCH_DECL_PROTECT(lev);
SYS_ARCH_PROTECT(lev); SYS_ARCH_PROTECT(lev);
conn->state = NETCONN_NONE; conn->state = NETCONN_NONE;
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
sys_sem_signal(&(conn->ioctrl_completed)); sys_sem_signal(sync->sem);
} }
static void lwip_sync_state_mt(struct lwip_sock *sock , int state) static void lwip_sync_state_mt(struct lwip_sock *sock, int state)
{ {
SOCK_MT_DEBUG(1, "sync state %d\n", state); SOCK_MT_DEBUG(1, "sync state %d\n", state);
switch (state) { switch (state) {
case SOCK_MT_STATE_ACCEPT : case SOCK_MT_STATE_ACCEPT :
if (sys_mbox_valid(&sock->conn->acceptmbox)) if (sys_mbox_valid(&sock->conn->acceptmbox))
sys_mbox_trypost(&sock->conn->acceptmbox, NULL); sys_mbox_trypost(&sock->conn->acceptmbox, NULL);
break; break;
case SOCK_MT_STATE_SEND : case SOCK_MT_STATE_SEND :
{ {
tcpip_callback(lwip_do_sync_send, sock->conn); socket_conn_sync_t sync;
sys_arch_sem_wait(&sock->conn->ioctrl_completed, 0);
break; sync.conn = sock->conn;
} sync.sem = sys_thread_sem_get();
case SOCK_MT_STATE_CONNECT :
if (sys_sem_valid(&(sock->conn->op_completed))) tcpip_callback(lwip_do_sync_send, &sync);
sys_sem_signal(&(sock->conn->op_completed)); sys_arch_sem_wait(sync.sem, 0);
break; break;
default : }
break; case SOCK_MT_STATE_CONNECT :
} if (sock->conn->current_msg && sys_sem_valid(sock->conn->current_msg->op_completed_sem))
sys_sem_signal(sock->conn->current_msg->op_completed_sem);
break;
default :
break;
}
} }
static void lwip_sync_recv_mt(struct lwip_sock *sock) static void lwip_sync_recv_mt(struct lwip_sock *sock)
{ {
SOCK_MT_DEBUG(1, "sync recv %d\n", sock->conn->socket); SOCK_MT_DEBUG(1, "sync recv %d\n", sock->conn->socket);
if (sys_mbox_valid(&sock->conn->recvmbox)) if (sys_mbox_valid(&sock->conn->recvmbox))
sys_mbox_trypost(&sock->conn->recvmbox, NULL); sys_mbox_trypost(&sock->conn->recvmbox, NULL);
} }
static void lwip_sync_select_mt(struct lwip_sock *sock) static void lwip_sync_select_mt(struct lwip_sock *sock)
{ {
SOCK_MT_DEBUG(1, "sync select %d\n", sock->conn->socket); SOCK_MT_DEBUG(1, "sync select %d\n", sock->conn->socket);
event_callback(sock->conn, NETCONN_EVT_ERROR, 0); event_callback(sock->conn, NETCONN_EVT_ERROR, 0);
} }
static void lwip_sync_mt(int s) static void lwip_sync_mt(int s)
{ {
int module = 0; int module = 0;
int ret; int ret;
struct lwip_sock *sock; struct lwip_sock *sock;
while (module < SOCK_MT_SELECT) { while (module < SOCK_MT_SELECT) {
extern void sys_arch_msleep(int ms); extern void sys_arch_msleep(int ms);
int ret;
SOCK_MT_TRYLOCK(s, module, ret); SOCK_MT_TRYLOCK(s, module, ret);
if (ret == ERR_OK) { if (ret == ERR_OK) {
/* /*
* we always lock the mutex in case of other thread entering, * we always lock the mutex in case of other thread entering,
* other thread will be blocked at "SOCK_MT_LOCK" and poll-check * other thread will be blocked at "SOCK_MT_LOCK" and poll-check
*/ */
//SOCK_MT_UNLOCK(s, module); //SOCK_MT_UNLOCK(s, module);
module++; module++;
continue; continue;
} }
sock = get_socket(s); sock = get_socket(s);
#if LWIP_SO_LINGER #if LWIP_SO_LINGER
if (SOCK_MT_GET_STATE(s) == SOCK_MT_STATE_SEND) { if (SOCK_MT_GET_STATE(s) == SOCK_MT_STATE_SEND) {
SOCK_MT_SET_LINGER(sock); SOCK_MT_SET_LINGER(sock);
} }
#endif #endif
if (!SOCK_MT_GET_SEL(s)) { if (!SOCK_MT_GET_SEL(s)) {
switch (module) { switch (module) {
case SOCK_MT_STATE: case SOCK_MT_STATE:
lwip_sync_state_mt(sock, SOCK_MT_GET_STATE(s)); lwip_sync_state_mt(sock, SOCK_MT_GET_STATE(s));
break; break;
case SOCK_MT_RECV: case SOCK_MT_RECV:
lwip_sync_recv_mt(sock); lwip_sync_recv_mt(sock);
break; break;
default : default :
break; break;
} }
} else { } else {
lwip_sync_select_mt(sock); lwip_sync_select_mt(sock);
} }
sys_arch_msleep(LWIP_SYNC_MT_SLEEP_MS); sys_arch_msleep(LWIP_SYNC_MT_SLEEP_MS);
} }
sock = tryget_socket(s); sock = tryget_socket(s);
if (sock) { if (sock) {
tcpip_callback(lwip_do_sync_rst_state, sock->conn); socket_conn_sync_t sync;
sys_arch_sem_wait(&sock->conn->ioctrl_completed, 0);
sync.conn = sock->conn;
sync.sem = sys_thread_sem_get();
tcpip_callback(lwip_do_sync_rst_state, &sync);
sys_arch_sem_wait(sync.sem, 0);
} }
} }
@ -733,17 +741,17 @@ int lwip_getsockopt_mt(int s, int level, int optname, void *optval, socklen_t *o
{ {
int ret; int ret;
if (optname == SO_ERROR ) { if (optname == SO_ERROR) {
int retval = 0; int retval = 0;
if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE) if (SOCK_MT_GET_SHUTDOWN(s) != SOCK_MT_SHUTDOWN_NONE)
retval = ENOTCONN; retval = ENOTCONN;
if (retval) { if (retval) {
*(int *)optval = retval; *(int *)optval = retval;
return 0; return 0;
} }
} }
LWIP_ENTER_MT(s, SOCK_MT_IOCTL, 0); LWIP_ENTER_MT(s, SOCK_MT_IOCTL, 0);
@ -768,7 +776,7 @@ int lwip_ioctl_mt(int s, long cmd, void *argp)
} }
int lwip_sendto_mt(int s, const void *data, size_t size, int flags, int lwip_sendto_mt(int s, const void *data, size_t size, int flags,
const struct sockaddr *to, socklen_t tolen) const struct sockaddr *to, socklen_t tolen)
{ {
int ret; int ret;
@ -795,7 +803,7 @@ int lwip_send_mt(int s, const void *data, size_t size, int flags)
} }
int lwip_recvfrom_mt(int s, void *mem, size_t len, int flags, int lwip_recvfrom_mt(int s, void *mem, size_t len, int flags,
struct sockaddr *from, socklen_t *fromlen) struct sockaddr *from, socklen_t *fromlen)
{ {
int ret; int ret;
@ -825,7 +833,7 @@ int lwip_write_mt(int s, const void *data, size_t size)
int lwip_fcntl_mt(int s, int cmd, int val) int lwip_fcntl_mt(int s, int cmd, int val)
{ {
int ret; int ret;
LWIP_ENTER_MT(s, SOCK_MT_IOCTL, 0); LWIP_ENTER_MT(s, SOCK_MT_IOCTL, 0);
@ -863,7 +871,7 @@ int lwip_close_mt(int s)
SYS_ARCH_DECL_PROTECT(lev); SYS_ARCH_DECL_PROTECT(lev);
sys_mutex_t lock_tmp[SOCK_MT_LOCK_MAX]; sys_mutex_t lock_tmp[SOCK_MT_LOCK_MAX];
__lwip_shutdown_mt(s, SHUT_RDWR); __lwip_shutdown_mt(s, SHUT_RDWR);
LWIP_ENTER_MT(s, SOCK_MT_CLOSE, 0); LWIP_ENTER_MT(s, SOCK_MT_CLOSE, 0);
@ -886,20 +894,20 @@ int lwip_close_mt(int s)
} }
int lwip_select_mt(int maxfdp1, fd_set *readset, fd_set *writeset, int lwip_select_mt(int maxfdp1, fd_set *readset, fd_set *writeset,
fd_set *exceptset, struct timeval *timeout) fd_set *exceptset, struct timeval *timeout)
{ {
int ret; int ret;
fd_set read_set, write_set; fd_set read_set, write_set;
int pset[2] = {(int)&read_set, (int)&write_set}; int pset[2] = {(int)&read_set, (int)&write_set};
FD_ZERO(&read_set); FD_ZERO(&read_set);
FD_ZERO(&write_set); FD_ZERO(&write_set);
if (readset) if (readset)
MEMCPY(&read_set, readset, sizeof(fd_set)); MEMCPY(&read_set, readset, sizeof(fd_set));
if (writeset) if (writeset)
MEMCPY(&write_set, writeset, sizeof(fd_set)); MEMCPY(&write_set, writeset, sizeof(fd_set));
LWIP_ENTER_MT(maxfdp1, SOCK_MT_SELECT, (int)pset); LWIP_ENTER_MT(maxfdp1, SOCK_MT_SELECT, (int)pset);
@ -910,25 +918,4 @@ int lwip_select_mt(int maxfdp1, fd_set *readset, fd_set *writeset,
return ret; return ret;
} }
#ifdef SOCKETS_TCP_TRACE
int lwip_trace_tcp(int s, int cmd, void *arg)
{
struct lwip_sock *sock;
u32_t *pbuf = (u32_t *)arg;
if (!(sock = tryget_socket(s)))
return -1;
ADD_TCP_SEND_BYTES_GET(sock->conn, &pbuf[0]);
ADD_TCP_SEND_BYTES_OK_GET(sock->conn, &pbuf[2]);
ADD_TCP_SEND_BYTES_NOMEM_GET(sock->conn, &pbuf[4]);
ADD_TCP_RECV_BYTES_GET(sock->conn, &pbuf[6]);
ADD_TCP_RECV_BYTES_ERR_GET(sock->conn, &pbuf[8]);
return 0;
}
#endif
#endif #endif

4
components/lwip/component.mk
View File

@ -3,8 +3,8 @@
# #
COMPONENT_ADD_INCLUDEDIRS += include/lwip/apps \ COMPONENT_ADD_INCLUDEDIRS += include/lwip/apps \
lwip/src/include \ lwip/src/include \
lwip/src/include/posix \ port/esp8266/include \
port/esp8266/include include/lwip/apps/multi-threads
COMPONENT_SRCDIRS += apps/dhcpserver \ COMPONENT_SRCDIRS += apps/dhcpserver \
apps/multi-threads \ apps/multi-threads \

33
components/lwip/include/lwip/apps/multi-threads/errno.h Normal file
View File

@ -0,0 +1,33 @@
/**
* @file
* This file is a posix wrapper for lwip/errno.h.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
*
*/
#include "posix/errno.h"

33
components/lwip/include/lwip/apps/multi-threads/netdb.h Normal file
View File

@ -0,0 +1,33 @@
/**
* @file
* This file is a posix wrapper for lwip/netdb.h.
*/
/*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
*
*/
#include "posix/netdb.h"

97
components/lwip/include/lwip/apps/multi-threads/sockets_mt.h → components/lwip/include/lwip/apps/multi-threads/sys/socket.h
View File

@ -1,8 +1,41 @@
#ifndef _SOCKETS_MT_H_ /**
#define _SOCKETS_MT_H_ * @file
* This file is a posix wrapper for lwip/sockets.h.
*/
#ifdef SOCKETS_MT /*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
*
*/
#ifndef _SOCKET_MT_H_
#define _SOCKET_MT_H_
#include "posix/sys/socket.h"
#if LWIP_COMPAT_SOCKETS == 3
int lwip_mt_init(void); int lwip_mt_init(void);
int lwip_socket_mt(int domain, int type, int protocol); int lwip_socket_mt(int domain, int type, int protocol);
int lwip_bind_mt(int s, const struct sockaddr *name, socklen_t namelen); int lwip_bind_mt(int s, const struct sockaddr *name, socklen_t namelen);
@ -27,46 +60,26 @@ int lwip_close_mt(int s);
int lwip_select_mt(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset, struct timeval *timeout); int lwip_select_mt(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset, struct timeval *timeout);
int lwip_fcntl_mt(int s, int cmd, int val); int lwip_fcntl_mt(int s, int cmd, int val);
#ifdef SOCKETS_TCP_TRACE #define accept(a,b,c) lwip_accept_mt(a,b,c)
int lwip_trace_tcp(int s, int cmd, void *arg); #define bind(a,b,c) lwip_bind_mt(a,b,c)
#endif #define shutdown(a,b) lwip_shutdown_mt(a,b)
#define connect(a,b,c) lwip_connect_mt(a,b,c)
#define getsockname(a,b,c) lwip_getsockname_mt(a,b,c)
#if LWIP_COMPAT_SOCKETS #define getpeername(a,b,c) lwip_getpeername_mt(a,b,c)
#define setsockopt(a,b,c,d,e) lwip_setsockopt_mt(a,b,c,d,e)
#ifdef SOCKETS_MT_DBUG #define getsockopt(a,b,c,d,e) lwip_getsockopt_mt(a,b,c,d,e)
#define listen(a,b) lwip_listen_mt(a,b)
#define accept(a,b,c) lwip_accept_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__); #define recv(a,b,c,d) lwip_recv_mt(a,b,c,d)
#define bind(a,b,c) lwip_bind_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__); #define recvfrom(a,b,c,d,e,f) lwip_recvfrom_mt(a,b,c,d,e,f)
#define shutdown(a,b) lwip_shutdown_mt(a,b); printf("%s %d\n", __FUNCTION__, __LINE__); #define send(a,b,c,d) lwip_send_mt(a,b,c,d)
#define closesocket(s) lwip_close_mt(s); printf("%s %d\n", __FUNCTION__, __LINE__); #define sendto(a,b,c,d,e,f) lwip_sendto_mt(a,b,c,d,e,f)
#define connect(a,b,c) lwip_connect_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__); #define socket(a,b,c) lwip_socket_mt(a,b,c)
#define getsockname(a,b,c) lwip_getsockname_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__);
#define getpeername(a,b,c) lwip_getpeername_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__);
#define setsockopt(a,b,c,d,e) lwip_setsockopt_mt(a,b,c,d,e); printf("%s %d\n", __FUNCTION__, __LINE__);
#define getsockopt(a,b,c,d,e) lwip_getsockopt_mt(a,b,c,d,e); printf("%s %d\n", __FUNCTION__, __LINE__);
#define listen(a,b) lwip_listen_mt(a,b); printf("%s %d\n", __FUNCTION__, __LINE__);
#define recv(a,b,c,d) lwip_recv_mt(a,b,c,d); printf("%s %d\n", __FUNCTION__, __LINE__);
#define recvfrom(a,b,c,d,e,f) lwip_recvfrom_mt(a,b,c,d,e,f); printf("%s %d\n", __FUNCTION__, __LINE__);
#define send(a,b,c,d) lwip_send_mt(a,b,c,d); printf("%s %d\n", __FUNCTION__, __LINE__);
#define sendto(a,b,c,d,e,f) lwip_sendto_mt(a,b,c,d,e,f); printf("%s %d\n", __FUNCTION__, __LINE__);
#define socket(a,b,c) lwip_socket_mt(a,b,c); printf("%s %d\n", __FUNCTION__, __LINE__);
#define select(a,b,c,d,e) lwip_select_mt(a,b,c,d,e) #define select(a,b,c,d,e) lwip_select_mt(a,b,c,d,e)
#define ioctlsocket(a,b,c) lwip_ioctl_mt(a,b,c) ; printf("%s %d\n", __FUNCTION__, __LINE__); #define ioctlsocket(a,b,c) lwip_ioctl_mt(a,b,c)
#if LWIP_POSIX_SOCKETS_IO_NAMES
#define read(a,b,c) lwip_read_mt(a,b,c)
#define write(a,b,c) lwip_write_mt(a,b,c)
#define close(s) lwip_close_mt(s)
#define fcntl(a,b,c) lwip_fcntl_mt(a,b,c)
#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
#else /* SOCKETS_MT_DBUG */
#define accept(a,b,c) lwip_accept_mt(a,b,c) #define accept(a,b,c) lwip_accept_mt(a,b,c)
#define bind(a,b,c) lwip_bind_mt(a,b,c) #define bind(a,b,c) lwip_bind_mt(a,b,c)
#define shutdown(a,b) lwip_shutdown_mt(a,b) #define shutdown(a,b) lwip_shutdown_mt(a,b)
#define closesocket(s) lwip_close_mt(s)
#define connect(a,b,c) lwip_connect_mt(a,b,c) #define connect(a,b,c) lwip_connect_mt(a,b,c)
#define getsockname(a,b,c) lwip_getsockname_mt(a,b,c) #define getsockname(a,b,c) lwip_getsockname_mt(a,b,c)
#define getpeername(a,b,c) lwip_getpeername_mt(a,b,c) #define getpeername(a,b,c) lwip_getpeername_mt(a,b,c)
@ -87,12 +100,6 @@ int lwip_trace_tcp(int s, int cmd, void *arg);
#define close(s) lwip_close_mt(s) #define close(s) lwip_close_mt(s)
#define fcntl(a,b,c) lwip_fcntl_mt(a,b,c) #define fcntl(a,b,c) lwip_fcntl_mt(a,b,c)
#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */ #endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
#endif /* SOCKETS_MT_DBUG */
#endif /* LWIP_COMPAT_SOCKETS */ #endif /* LWIP_COMPAT_SOCKETS */
#endif /* SOCKETS_MT */ #endif /* _SOCKET_H_ */
#endif

1
components/lwip/port/esp8266/include/arch/sys_arch.h
View File

@ -55,6 +55,7 @@ typedef xTaskHandle sys_thread_t;
sys_sem_t* sys_thread_sem_init(void); sys_sem_t* sys_thread_sem_init(void);
void sys_thread_sem_deinit(void); void sys_thread_sem_deinit(void);
sys_sem_t* sys_thread_sem_get(void); sys_sem_t* sys_thread_sem_get(void);
err_t sys_mutex_trylock(sys_mutex_t *pxMutex);
#define LWIP_NETCONN_THREAD_SEM_ALLOC() sys_thread_sem_init() #define LWIP_NETCONN_THREAD_SEM_ALLOC() sys_thread_sem_init()
#define LWIP_NETCONN_THREAD_SEM_FREE() sys_thread_sem_deinit() #define LWIP_NETCONN_THREAD_SEM_FREE() sys_thread_sem_deinit()

4
components/lwip/port/esp8266/include/lwipopts.h
View File

@ -50,7 +50,7 @@
#include "esp_libc.h" #include "esp_libc.h"
#include "esp_system.h" #include "esp_system.h"
//#define SOCKETS_MT #define SOCKETS_MT
//#define SOCKETS_TCP_TRACE //#define SOCKETS_TCP_TRACE
@ -1351,7 +1351,7 @@
* While this helps code completion, it might conflict with existing libraries. * While this helps code completion, it might conflict with existing libraries.
* (only used if you use sockets.c) * (only used if you use sockets.c)
*/ */
#define LWIP_COMPAT_SOCKETS 1 #define LWIP_COMPAT_SOCKETS 3
/** /**
* LWIP_POSIX_SOCKETS_IO_NAMES==1: Enable POSIX-style sockets functions names. * LWIP_POSIX_SOCKETS_IO_NAMES==1: Enable POSIX-style sockets functions names.