Skip to content

Commit

Permalink
Improve performance in get_img().
Browse files Browse the repository at this point in the history 
1. modify gcc shell for using libevhtp;
2. remove root_path from setting;
3. add dump_cb to just dump request;
4. use image/png as the default content-type.
  • Loading branch information
@buaazp
buaazp committed Jul 20, 2013
1 parent d69639c commit 037aa84
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 88 deletions.
4 changes: 2 additions & 2 deletions gcc.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/bash
gcc -levent -lMagickWand-Q16 -lmemcached zconf.c zspinlock.c zlog.c zmd5.c zutil.c zcache.c zimg.c zhttpd.c zthread.c zworkqueue.c main.c -o main
gcc -g -levent -levent_openssl -levent_pthreads -lssl -lcrypto -levhtp -lMagickWand-Q16 -lmemcached zhttpd.c zspinlock.c zlog.c zmd5.c zutil.c zcache.c zimg.c main.c -o main
#for linux
gcc -levent -lMagickWand -lmemcached zconf.c zspinlock.c zlog.c zmd5.c zutil.c zcache.c zimg.c zhttpd.c zthread.c zworkqueue.c main.c -o main
gcc -g -levent -levent_openssl -levent_pthreads -lssl -lcrypto -levhtp -lMagickWand -lmemcached zhttpd.c zspinlock.c zlog.c zmd5.c zutil.c zcache.c zimg.c main.c -o main
22 changes: 11 additions & 11 deletions main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ void kill_server(void);

static void settings_init(void)
{
strcpy(settings.root_path, "./www");
// strcpy(settings.root_path, "./www");
strcpy(settings.img_path, "./img");
settings.port = 4869;
settings.backlog = 1024;
settings.num_threads = 4; /* N workers */
settings.log = false;
settings.cache_on = false;
settings.cache_port = 11211;
settings.max_keepalives = 1;
settings.max_keepalives = 0;
}

static void sighandler(int signal)
Expand Down Expand Up @@ -132,15 +132,15 @@ int main(int argc, char **argv)

//init the Path zimg need to use.
LOG_PRINT(LOG_INFO, "Begin to Init the Path zimg Using...");
if(is_dir(settings.root_path) != 1)
{
if(mk_dir(settings.root_path) != 1)
{
LOG_PRINT(LOG_ERROR, "root_path[%s] Create Failed!", settings.root_path);
return -1;
}
}

// if(is_dir(settings.root_path) != 1)
// {
// if(mk_dir(settings.root_path) != 1)
// {
// LOG_PRINT(LOG_ERROR, "root_path[%s] Create Failed!", settings.root_path);
// return -1;
// }
// }
//
if(is_dir(settings.img_path) != 1)
{
if(mk_dir(settings.img_path) != 1)
Expand Down
106 changes: 78 additions & 28 deletions zhttpd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
#include <evhtp.h>
#include "zhttpd.h"
#include "zimg.h"
#include "zworkqueue.h"

char uri_root[512];
extern struct setting settings;

static const char * guess_type(const char *type);
static const char * guess_content_type(const char *path);
static void print_headers(evhtp_header_t * header, void * arg);
void dump_request_cb(evhtp_request_t *req, void *arg);
void post_request_cb(evhtp_request_t *req, void *arg);
void send_document_cb(evhtp_request_t *req, void *arg);
Expand All @@ -52,6 +51,26 @@ static const struct table_entry {
{ NULL, NULL },
};

static const char * method_strmap[] = {
"GET",
"HEAD",
"POST",
"PUT",
"DELETE",
"MKCOL",
"COPY",
"MOVE",
"OPTIONS",
"PROPFIND",
"PROPATCH",
"LOCK",
"UNLOCK",
"TRACE",
"CONNECT",
"PATCH",
"UNKNOWN",
};

/* Try to guess a good content-type for 'path' */
static const char * guess_type(const char *type)
{
Expand Down Expand Up @@ -81,6 +100,16 @@ static const char * guess_content_type(const char *path)
return "application/misc";
}

static void print_headers(evhtp_header_t * header, void * arg)
{
evbuf_t * buf = arg;

evbuffer_add(buf, header->key, header->klen);
evbuffer_add(buf, ": ", 2);
evbuffer_add(buf, header->val, header->vlen);
evbuffer_add(buf, "\r\n", 2);
}

/* Callback used for the /dump URI, and for every non-GET request:
* dumps all information to stdout and gives back a trivial 200 ok */
void dump_request_cb(evhtp_request_t *req, void *arg)
Expand All @@ -89,23 +118,17 @@ void dump_request_cb(evhtp_request_t *req, void *arg)
const char *uri = req->uri->path->full;

//switch (evhtp_request_t_get_command(req)) {
switch (evhtp_request_get_method(req)){
case EVHTTP_REQ_GET: cmdtype = "GET"; break;
case EVHTTP_REQ_POST: cmdtype = "POST"; break;
case EVHTTP_REQ_HEAD: cmdtype = "HEAD"; break;
case EVHTTP_REQ_PUT: cmdtype = "PUT"; break;
case EVHTTP_REQ_DELETE: cmdtype = "DELETE"; break;
case EVHTTP_REQ_OPTIONS: cmdtype = "OPTIONS"; break;
case EVHTTP_REQ_TRACE: cmdtype = "TRACE"; break;
case EVHTTP_REQ_CONNECT: cmdtype = "CONNECT"; break;
case EVHTTP_REQ_PATCH: cmdtype = "PATCH"; break;
default: cmdtype = "unknown"; break;
}
int req_method = evhtp_request_get_method(req);
if(req_method >= 16)
req_method = 16;

LOG_PRINT(LOG_INFO, "Received a %s request for %s",
cmdtype, uri);
LOG_PRINT(LOG_INFO, "Received a %s request for %s", method_strmap[req_method], uri);
evbuffer_add_printf(req->buffer_out, "uri : %s\r\n", uri);
evbuffer_add_printf(req->buffer_out, "query : %s\r\n", req->uri->query_raw);
evhtp_headers_for_each(req->uri->query, print_headers, req->buffer_out);
evbuffer_add_printf(req->buffer_out, "Method : %s\n", method_strmap[req_method]);
evhtp_headers_for_each(req->headers_in, print_headers, req->buffer_out);

evbuffer_add_reference(req->buffer_out, "dump_request_cb\n", 12, NULL, NULL);
evbuf_t *buf = req->buffer_in;;
puts("Input data: <<<");
while (evbuffer_get_length(buf)) {
Expand All @@ -117,6 +140,7 @@ void dump_request_cb(evhtp_request_t *req, void *arg)
}
puts(">>>");

evhtp_headers_add_header(req->headers_out, evhtp_header_new("Content-Type", "text/plain", 0, 0));
evhtp_send_reply(req, EVHTP_RES_OK);
}

Expand All @@ -132,7 +156,17 @@ void post_request_cb(evhtp_request_t *req, void *arg)
char *fileName = NULL;
char *boundaryPattern = NULL;
char *buff = NULL;


int req_method = evhtp_request_get_method(req);
if(req_method >= 16)
req_method = 16;
LOG_PRINT(LOG_INFO, "Method: %d", req_method);
if(method_strmap[req_method] != "POST")
{
LOG_PRINT(LOG_INFO, "Request Method Not Support.");
goto err;
}


const char *content_len = evhtp_header_find(req->headers_in, "Content-Length");
post_size = atoi(content_len);
Expand Down Expand Up @@ -287,7 +321,7 @@ void post_request_cb(evhtp_request_t *req, void *arg)
char md5sum[33];

LOG_PRINT(LOG_INFO, "Begin to Save Image...");
if(save_img(buff+start, img_size, md5sum, fileType) == -1)
if(save_img(buff+start, img_size, md5sum) == -1)
{
LOG_PRINT(LOG_ERROR, "Image Save Failed!");
goto err;
Expand Down Expand Up @@ -334,6 +368,23 @@ void send_document_cb(evhtp_request_t *req, void *arg)
zimg_req_t *zimg_req = NULL;
char *buff = NULL;

int req_method = evhtp_request_get_method(req);
if(req_method >= 16)
req_method = 16;
LOG_PRINT(LOG_INFO, "Method: %d", req_method);
if(method_strmap[req_method] == "POST")
{
LOG_PRINT(LOG_INFO, "POST Request.");
post_request_cb(req, NULL);
return;
}
else if(method_strmap[req_method] != "GET")
{
LOG_PRINT(LOG_INFO, "Request Method Not Support.");
goto err;
}


const char *uri;
uri = req->uri->path->full;
const char *rfull = req->uri->path->full;
Expand Down Expand Up @@ -371,7 +422,9 @@ void send_document_cb(evhtp_request_t *req, void *arg)
/* This holds the content we're sending. */

int width, height, proportion, gray;
if(strchr(uri, '?') == 0)
evhtp_kvs_t *params;
params = req->uri->query;
if(!params)
{
width = 0;
height = 0;
Expand All @@ -380,8 +433,6 @@ void send_document_cb(evhtp_request_t *req, void *arg)
}
else
{
evhtp_kvs_t *params;
params = req->uri->query;
const char *str_w, *str_h;
str_w = evhtp_kv_find(params, "w");
if(str_w == NULL)
Expand All @@ -403,6 +454,7 @@ void send_document_cb(evhtp_request_t *req, void *arg)
);
evhtp_headers_add_header(req->headers_out, evhtp_header_new("Content-Type", "text/html", 0, 0));
evhtp_send_reply(req, EVHTP_RES_OK);
LOG_PRINT(LOG_INFO, "============send_document_cb() DONE!===============");
goto done;
}
else
Expand All @@ -429,8 +481,7 @@ void send_document_cb(evhtp_request_t *req, void *arg)
zimg_req -> proportion = proportion;
zimg_req -> gray = gray;

char img_type[10];
int get_img_rst = get_img(zimg_req, &buff, img_type, &len);
int get_img_rst = get_img(zimg_req, &buff, &len);


if(get_img_rst == -1)
Expand All @@ -443,11 +494,9 @@ void send_document_cb(evhtp_request_t *req, void *arg)
evbuffer_add(req->buffer_out, buff, len);

LOG_PRINT(LOG_INFO, "Got the File!");
LOG_PRINT(LOG_INFO, "img_type: %s", img_type);
const char *type = guess_type(img_type);
LOG_PRINT(LOG_INFO, "guess_img_type: %s", type);
evhtp_headers_add_header(req->headers_out, evhtp_header_new("Content-Type", "image/jpeg", 0, 0));
evhtp_headers_add_header(req->headers_out, evhtp_header_new("Content-Type", "image/png", 0, 0));
evhtp_send_reply(req, EVHTP_RES_OK);
LOG_PRINT(LOG_INFO, "============send_document_cb() DONE!===============");


if(get_img_rst == 2)
Expand All @@ -463,6 +512,7 @@ void send_document_cb(evhtp_request_t *req, void *arg)
evbuffer_add_printf(req->buffer_out, "<html><body><h1>404 Not Found!</h1></body></html>");
evhtp_headers_add_header(req->headers_out, evhtp_header_new("Content-Type", "text/html", 0, 0));
evhtp_send_reply(req, EVHTP_RES_NOTFOUND);
LOG_PRINT(LOG_INFO, "============send_document_cb() ERROR!===============");

done:
if(buff)
Expand Down
Loading

0 comments on commit 037aa84

Please sign in to comment.