sam/khttp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working on server

Browse Source
This commit is contained in:
Sam Stevens
2014-08-18 19:11:04 +01:00
parent a7feac05e6
commit d6cb6aa3ea
16 changed files with 287 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nbproject/Makefile-Debug.mk
View File

@@ -48,6 +48,10 @@ OBJECTFILES= \
${OBJECTDIR}/src/mime.o \
${OBJECTDIR}/src/queue.o \
${OBJECTDIR}/src/server-connection.o \
${OBJECTDIR}/src/server-loop-read.o \
${OBJECTDIR}/src/server-loop-worker.o \
${OBJECTDIR}/src/server-loop-write.o \
${OBJECTDIR}/src/server-loop.o \
${OBJECTDIR}/src/server-socket.o \
${OBJECTDIR}/src/server-state.o \
${OBJECTDIR}/src/server.o \
@@ -145,6 +149,26 @@ ${OBJECTDIR}/src/server-connection.o: nbproject/Makefile-${CND_CONF}.mk src/serv
${RM} "$@.d"
$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-connection.o src/server-connection.c
${OBJECTDIR}/src/server-loop-read.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-read.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-read.o src/server-loop-read.c
${OBJECTDIR}/src/server-loop-worker.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-worker.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-worker.o src/server-loop-worker.c
${OBJECTDIR}/src/server-loop-write.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-write.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-write.o src/server-loop-write.c
${OBJECTDIR}/src/server-loop.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -g -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop.o src/server-loop.c
${OBJECTDIR}/src/server-socket.o: nbproject/Makefile-${CND_CONF}.mk src/server-socket.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"

24
nbproject/Makefile-Release.mk
View File

@@ -48,6 +48,10 @@ OBJECTFILES= \
${OBJECTDIR}/src/mime.o \
${OBJECTDIR}/src/queue.o \
${OBJECTDIR}/src/server-connection.o \
${OBJECTDIR}/src/server-loop-read.o \
${OBJECTDIR}/src/server-loop-worker.o \
${OBJECTDIR}/src/server-loop-write.o \
${OBJECTDIR}/src/server-loop.o \
${OBJECTDIR}/src/server-socket.o \
${OBJECTDIR}/src/server-state.o \
${OBJECTDIR}/src/server.o \
@@ -145,6 +149,26 @@ ${OBJECTDIR}/src/server-connection.o: nbproject/Makefile-${CND_CONF}.mk src/serv
${RM} "$@.d"
$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-connection.o src/server-connection.c
${OBJECTDIR}/src/server-loop-read.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-read.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-read.o src/server-loop-read.c
${OBJECTDIR}/src/server-loop-worker.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-worker.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-worker.o src/server-loop-worker.c
${OBJECTDIR}/src/server-loop-write.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop-write.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop-write.o src/server-loop-write.c
${OBJECTDIR}/src/server-loop.o: nbproject/Makefile-${CND_CONF}.mk src/server-loop.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.c) -O2 -Werror -DINI_ALLOW_BOM=0 -DINI_ALLOW_MULTILINE=0 -D_GNU_SOURCE -Ilib -std=c99 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/server-loop.o src/server-loop.c
${OBJECTDIR}/src/server-socket.o: nbproject/Makefile-${CND_CONF}.mk src/server-socket.c
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"

25
nbproject/configurations.xml
View File

@@ -18,6 +18,7 @@
<itemPath>src/mime.h</itemPath>
<itemPath>src/queue.h</itemPath>
<itemPath>src/server-connection.h</itemPath>
<itemPath>src/server-loop.h</itemPath>
<itemPath>src/server-socket.h</itemPath>
<itemPath>src/server-state.h</itemPath>
<itemPath>src/server.h</itemPath>
@@ -46,6 +47,10 @@
<itemPath>src/mime.c</itemPath>
<itemPath>src/queue.c</itemPath>
<itemPath>src/server-connection.c</itemPath>
<itemPath>src/server-loop-read.c</itemPath>
<itemPath>src/server-loop-worker.c</itemPath>
<itemPath>src/server-loop-write.c</itemPath>
<itemPath>src/server-loop.c</itemPath>
<itemPath>src/server-socket.c</itemPath>
<itemPath>src/server-state.c</itemPath>
<itemPath>src/server.c</itemPath>
@@ -161,6 +166,16 @@
</item>
<item path="src/server-connection.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/server-loop-read.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop-worker.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop-write.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/server-socket.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-socket.h" ex="false" tool="3" flavor2="0">
@@ -279,6 +294,16 @@
</item>
<item path="src/server-connection.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/server-loop-read.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop-worker.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop-write.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-loop.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/server-socket.c" ex="false" tool="0" flavor2="0">
</item>
<item path="src/server-socket.h" ex="false" tool="3" flavor2="0">

10
src/main-loop.c
View File

@@ -98,28 +98,24 @@ void hmain_setup(hmain_status *status) {
pool->min_threads = 1;
pool->max_threads = 2;
pool->func = thloop_read;
status->pools[POOL_READ] = pool;
thread_pool_start(pool);
pool = thread_pool_new("write", queue_new());
pool->min_threads = 1;
pool->max_threads = 2;
pool->func = thloop_write;
status->pools[POOL_WRITE] = pool;
thread_pool_start(pool);
pool = thread_pool_new("disk_read", queue_new());
pool->min_threads = 1;
pool->max_threads = 2;
pool->func = thloop_disk_read;
status->pools[POOL_DISK_READ] = pool;
thread_pool_start(pool);
pool = thread_pool_new("worker", queue_new());
pool->min_threads = 1;
pool->max_threads = 5;
pool->func = thloop_worker;
status->pools[POOL_WORKERS] = pool;
thread_pool_start(pool);
}
@@ -211,7 +207,7 @@ void hmain_loop(hmain_status *status) {
if (conn->isReading == true) {
continue;
}
queue_add(status->pools[POOL_READ]->queue, queue_item_new2("READ", (void*)conn));
queue_add(status->pools[1]->queue, queue_item_new2("READ", (void*)conn));
}
} else if (EVENT_IS(current_event, EPOLLOUT)) {
//Data can be written to connection
@@ -219,7 +215,7 @@ void hmain_loop(hmain_status *status) {
if (conn->isWriting == true || (conn->pending_responses == NULL && conn->pending_write == NULL)) {
continue;
}
queue_add(status->pools[POOL_WRITE]->queue, queue_item_new2("WRITE", (void*)conn));
queue_add(status->pools[2]->queue, queue_item_new2("WRITE", (void*)conn));
}
}//for events
}//while shutdown == false
@@ -257,7 +253,7 @@ void* thloop_read(void * arg) {
//conn->pending_write = data_pool_appendbuffer(conn->pending_write, conn->status->buffer_pool, buffer, count);
queue_add(conn->status->pools[POOL_WRITE]->queue, queue_item_new2("WRITE", (void*)conn));
queue_add(conn->status->pools[2]->queue, queue_item_new2("WRITE", (void*)conn));
/*if (conn->parse_data == NULL) {
conn->parse_data = calloc(1, sizeof(hmain_parse_data));
conn->parse_data->parser = calloc(1, sizeof(http_parser));

2
src/main-loop.h
View File

@@ -22,7 +22,7 @@ extern "C" {
#define CONN_UNLOCK(c) pthread_mutex_unlock(c->mutex)
typedef enum hmain_pool {
POOL_READ, POOL_WRITE, POOL_WORKERS, POOL_DISK_READ
POOL_READA, POOL_WRITEA, POOL_WORKERSA, POOL_DISK_READA
} hmain_pool;
//typedef enum skt_elem_hstate {HSTATE_NONE, HSTATE_VALUE, HSTATE_FIELD} skt_elem_hstate;

15
src/server-loop-read.c Normal file
View File

@@ -0,0 +1,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include "util.h"
#include "log.h"
#include "config.h"
#include "server-connection.h"
#include "server-state.h"
#include "server-loop.h"
void* server_loop_read(void* arg) {
}

15
src/server-loop-worker.c Normal file
View File

@@ -0,0 +1,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include "util.h"
#include "log.h"
#include "config.h"
#include "server-connection.h"
#include "server-state.h"
#include "server-loop.h"
void* server_loop_worker(void* arg) {
}

15
src/server-loop-write.c Normal file
View File

@@ -0,0 +1,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include "util.h"
#include "log.h"
#include "config.h"
#include "server-connection.h"
#include "server-state.h"
#include "server-loop.h"
void* server_loop_write(void* arg) {
}

14
src/server-loop.c Normal file
View File

@@ -0,0 +1,14 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include "util.h"
#include "log.h"
#include "config.h"
#include "server-connection.h"
#include "server-state.h"
void server_loop(server_status *state) {
}

32
src/server-loop.h Normal file
View File

@@ -0,0 +1,32 @@
/*
* File: server-loop.h
* Author: sam
*
* Created on 18 August 2014, 17:16
*/
#ifndef SERVER_LOOP_H
#define SERVER_LOOP_H
#ifdef __cplusplus
extern "C" {
#endif
#include "server-state.h"
#define EP_CONN(event) (server_connection*)event->data.ptr
#define EP_EVENT_IS(event, type) ((event->events & type) == type)
#define EP_EVENT_ISNOT(event, type) (!EVENT_IS(event, type))
void server_loop(server_status *state);
void* server_loop_read(void* arg);
void* server_loop_write(void* arg);
void* server_loop_worker(void* arg);
#ifdef __cplusplus
}
#endif
#endif /* SERVER_LOOP_H */

49
src/server-socket.c
View File

@@ -7,13 +7,14 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <poll.h>
#include <sys/epoll.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
#include "util.h"
#include "socket.h"
#include "server-socket.h"
#include "util.h"
int server_socket_create() {
int fd = 0;
@@ -24,6 +25,9 @@ int server_socket_create() {
return fd;
}
void server_socket_listen(int fd, uint16_t port) {
assert(fd>=0);
assert(port>0);
struct sockaddr_in server_address;
memset(&server_address, 0, sizeof server_address);
server_address.sin_family = AF_INET;
@@ -40,30 +44,35 @@ void server_socket_listen(int fd, uint16_t port) {
}
info("Listening on port %u", port);
}
void server_socket_listen_epoll(int fd, uint16_t port, int *out_epfd) {
assert(out_epfd != NULL);
server_socket_listen(fd, port);
int epfd = 0;
//Open epoll socket
epfd = epoll_create1(0);
if (epfd < 0) {
fatal("Failed to create epollfd");
}
//Register socket with epoll
struct epoll_event svr_event;
svr_event.data.fd = fd;
svr_event.events = EPOLLIN | EPOLLET;
if (epoll_ctl(epfd, EPOLL_CTL_ADD, fd, &svr_event) < 0) {
fatal("Could not register server socket with epoll");
}
*out_epfd = epfd;
}
void server_socket_release(int fd) {
assert(fd>=0);
if (close(fd) < 0) {
warning(true, "could not close socket");
}
}
bool server_socket_canaccept(int fd) {
struct pollfd* pfd = calloc(1, sizeof(struct pollfd));
pfd[0].fd = fd;
pfd[0].events = POLLIN;
if (poll(pfd, 1, 50/*ms*/) < 0) {
warning(true, "poll failed");
free(pfd);
return false;
}
if ((pfd[0].revents & POLLIN) == POLLIN) {
free(pfd);
return true;
}
free(pfd);
return false;
}
socket_info* server_socket_accept(int fd, int flags) {
assert(fd>=0);
struct sockaddr_in* clientaddr = calloc(1, sizeof(struct sockaddr_in));
int clientfd=0;

2
src/server-socket.h
View File

@@ -18,8 +18,8 @@ extern "C" {
int server_socket_create();
void server_socket_listen(int fd, uint16_t port);
void server_socket_listen_epoll(int fd, uint16_t port, int *out_epfd);
void server_socket_release(int fd);
bool server_socket_canaccept(int fd);
socket_info* server_socket_accept(int fd, int flags);

9
src/server-state.c
View File

@@ -10,6 +10,7 @@
#include "server-state.h"
#include "queue.h"
#include "thread-pool.h"
#include "main-loop.h"
server_status* server_status_new(config_server *config) {
assert(config!=NULL);
@@ -40,7 +41,7 @@ void server_status_delete(server_status *status) {
free(status);
}
void server_start_pools(server_status *status) {
void server_start_pools(server_status *status, thread_func pool_functions[]) {
assert(status!=NULL);
assert(status->pools[0]==NULL);
@@ -48,21 +49,21 @@ void server_start_pools(server_status *status) {
thread_pool *pool = thread_pool_new("read", queue_new());
pool->min_threads = 1;
pool->max_threads = 2;
//pool->func = thloop_read;
pool->func = pool_functions[POOL_READ];
status->pools[POOL_READ] = pool;
thread_pool_start(pool);
pool = thread_pool_new("write", queue_new());
pool->min_threads = 1;
pool->max_threads = 2;
//pool->func = thloop_write;
pool->func = pool_functions[POOL_WRITE];
status->pools[POOL_WRITE] = pool;
thread_pool_start(pool);
pool = thread_pool_new("worker", queue_new());
pool->min_threads = 1;
pool->max_threads = 5;
//pool->func = thloop_worker;
pool->func = pool_functions[POOL_WORKER];
status->pools[POOL_WORKER] = pool;
thread_pool_start(pool);
}

2
src/server-state.h
View File

@@ -34,7 +34,7 @@ extern "C" {
server_status* server_status_new(config_server *config);
void server_status_delete(server_status *status);
void server_start_pools(server_status *status);
void server_start_pools(server_status *status, thread_func pool_functions[]);
void server_stop_pools(server_status *status);
#ifdef __cplusplus

77
src/server.c
View File

@@ -1,6 +1,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <assert.h>
#include <fcntl.h>
#include <unistd.h>
#include "log.h"
#include "util.h"
@@ -13,5 +16,79 @@
#include "config.h"
#include "server-socket.h"
#include "server-state.h"
#include "server-connection.h"
#include "server-loop.h"
#include "server.h"
void server_start(server_status *status, const char* config_file) {
assert(status!=NULL);
assert(status->stopped==true);
status->shutdown_requested = false;
//Start Logging
log_register_add(log_new("stderr", stderr), true, LALL & ~(LINFO|LDEBUG));
log_register_add(log_new("stdout", stdout), false, LDEBUG | LINFO);
//Load mime types
mime_init(NULL);
//Load the config
config_server *config = config_server_new();
if (config_read_ini(config_file, config) < 0) {
fatal("Could not read config");
}
status->config = config;
//Open the server socket
status->sfd = server_socket_create();
server_socket_listen_epoll(status->sfd, config->listen_port, &status->epollfd);
//Start thread pools
thread_func pool_functions[] = {
[POOL_READ] = server_loop_read,
[POOL_WRITE] = server_loop_write,
[POOL_WORKER] = server_loop_worker
};
server_start_pools(status, pool_functions);
status->started = true;
status->stopped = false;
//Start the main loop
server_loop(status);
//Cleanup after the loop exits
server_teardown(status);
}
void server_teardown(server_status *status) {
assert(status!=NULL);
assert(status->stopped==true);
//Stop thread pools
server_stop_pools(status);
//Close connections
server_connection *elem, *tmp;
LL_FOREACH_SAFE(status->clients, elem, tmp) {
skt_close(elem->skt);
LL_DELETE(status->clients, elem);
server_connection_delete(elem);
}
//Close server socket
close(status->epollfd);
server_socket_release(status->sfd);
//Free mime data
mime_destroy();
//Stop loggers
log_register_clear();
//Delete config
config_server_delete(status->config);
server_status_delete(status);
}

7
src/server.h
View File

@@ -11,8 +11,13 @@
#ifdef __cplusplus
extern "C" {
#endif
#define DEFAULT_CONFIG_FILE "khttpd.ini"
#include "server-state.h"
void server_start(server_status *status, const char* config_file);
void server_teardown(server_status *status);
#ifdef __cplusplus
}