mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- nhttp: enable threading

Browse Source 
This is ported from neutrino-mp and contains code by martii and seife
from following commits:
20d3031b8bb47b5af79bf10c385e3564fe5c26dc
93d01c1987
363633dc1b
c3e1310a2f727e26ce11669e3aeae78305f87049
This commit is contained in:
svenhoefer
2014-08-19 13:13:31 +02:00
committed by [CST] Focus
parent f9c7662c73
commit 7589a3a9e0
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nhttpd/yhttpd_core/ysocket.cpp
View File

@@ -229,7 +229,7 @@ bool CySocket::set_option(int typ, int option) {
void CySocket::set_reuse_port() {
#ifdef SO_REUSEPORT
if(!set_option(SOL_SOCKET, SO_REUSEPORT))
dperror("setsockopt(SO_REUSEPORT)\n");
dperror("setsockopt(SO_REUSEPORT)\n");
#endif
}
@@ -239,7 +239,7 @@ void CySocket::set_reuse_port() {
void CySocket::set_reuse_addr() {
#ifdef SO_REUSEADDR
if(!set_option(SOL_SOCKET, SO_REUSEADDR))
dperror("setsockopt(SO_REUSEADDR)\n");
dperror("setsockopt(SO_REUSEADDR)\n");
#endif
}
@@ -249,7 +249,7 @@ void CySocket::set_reuse_addr() {
void CySocket::set_keep_alive() {
#ifdef SO_KEEPALIVE
if(!set_option(SOL_SOCKET, SO_KEEPALIVE))
dperror("setsockopt(SO_KEEPALIVE)\n");
dperror("setsockopt(SO_KEEPALIVE)\n");
#endif
}
@@ -259,7 +259,7 @@ void CySocket::set_keep_alive() {
void CySocket::set_tcp_nodelay() {
#ifdef TCP_NODELAY
if(!set_option(IPPROTO_TCP, TCP_NODELAY))
dperror("setsockopt(SO_KEEPALIVE)\n");
dperror("setsockopt(SO_KEEPALIVE)\n");
#endif
}
//=============================================================================
@@ -271,10 +271,10 @@ void CySocket::set_tcp_nodelay() {
int CySocket::Read(char *buffer, unsigned int length) {
#ifdef Y_CONFIG_USE_OPEN_SSL
if(isSSLSocket)
return SSL_read(ssl, buffer, length);
return SSL_read(ssl, buffer, length);
else
#endif
return ::read(sock, buffer, length);
return ::read(sock, buffer, length);
}
//-----------------------------------------------------------------------------
// Send a buffer (normal or SSL)
@@ -283,7 +283,7 @@ int CySocket::Send(char const *buffer, unsigned int length) {
unsigned int len = 0;
#ifdef Y_CONFIG_USE_OPEN_SSL
if(isSSLSocket)
len = SSL_write(ssl, buffer, length);
len = SSL_write(ssl, buffer, length);
else
#endif
len = ::send(sock, buffer, length, MSG_NOSIGNAL);
@@ -323,6 +323,9 @@ bool CySocket::SendFile(int filed, off_t start, off_t size) {
if (size > -1 && size < left)
left = size;
#ifdef Y_CONFIG_HAVE_SENDFILE
#ifdef Y_CONFIG_USE_OPEN_SSL
if(!isSSLSocket)
#endif
while (left > 0) {
// split sendfile() transfer to smaller chunks to reduce memory-mapping requirements
if((written = ::sendfile(sock, filed, &start, std::min((off_t) 0x8000000LL, left))) == -1) {
@@ -334,7 +337,7 @@ bool CySocket::SendFile(int filed, off_t start, off_t size) {
} else {
BytesSend += written;
left -= written;
}
}
}
#endif // Y_CONFIG_HAVE_SENDFILE
if (left > 0) {
@@ -347,7 +350,6 @@ bool CySocket::SendFile(int filed, off_t start, off_t size) {
perror("send failed");
return false;
}
BytesSend += written;
left -= written;
}
}
@@ -372,7 +374,7 @@ unsigned int CySocket::ReceiveFileGivenLength(int filed, unsigned int _length) {
u_long readarg = 0;
#ifdef Y_CONFIG_USE_OPEN_SSL
if(isSSLSocket)
readarg = RECEIVE_BLOCK_LEN;
readarg = RECEIVE_BLOCK_LEN;
else
#endif
{

8
src/nhttpd/yhttpd_core/ywebserver.cpp
View File

@@ -48,7 +48,7 @@ CWebserver::CWebserver() {
FD_ZERO(&read_fds);
fdmax = 0;
open_connections = 0;
#ifdef Y_CONFIG_BUILD_AS_DAEMON
#ifdef Y_CONFIG_FEATURE_THREADING
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
#endif
@@ -412,13 +412,13 @@ bool CWebserver::handle_connection(CySocket *newSock) {
newConn->ySock = newSock;
newConn->ySock->handling = true;
newConn->WebserverBackref = this;
#ifdef Y_CONFIG_BUILD_AS_DAEMON
#ifdef Y_CONFIG_FEATURE_THREADING
newConn->is_treaded = is_threading;
#else
newConn->is_treaded = false;
#endif
int index = -1;
#ifdef Y_CONFIG_BUILD_AS_DAEMON
#ifdef Y_CONFIG_FEATURE_THREADING
if(is_threading)
{
pthread_mutex_lock( &mutex );
@@ -442,7 +442,7 @@ bool CWebserver::handle_connection(CySocket *newSock) {
// start connection Thread
if(pthread_create(&Connection_Thread_List[index], &attr, WebThread, (void *)newConn) != 0)
dperror("Could not create Connection-Thread\n");
dperror("Could not create Connection-Thread\n");
}
else // non threaded
#endif