deleted file mode 100644

@@ -1,71 +0,0 @@

-/*

- * iobuf.c

- *

- * An I/O buffer library based on sbuf.

- *

- * History:

- *      12/03/2014 Creation.

- *      14/03/2014 Compilation fixes.

- *

- * Author: Dario Rodriguez dario@softhome.net

- * This library is licensed on the terms of the GNU LGPL v2+

- */

-

-#include <stdlib.h>

-#include <string.h>

-#include "iobuf.h"

-

-/* exported funcions */

-siobuf *

-iobuf_init(int insize,int outsize)

-{

-        siobuf *iobuf;

-        if((iobuf=malloc(sizeof(siobuf)))==NULL)

-                return(NULL);

-        memset(iobuf,0,sizeof(siobuf));

-        if((iobuf->in=sbuf_init(insize))==NULL) {

-                free(iobuf),iobuf=NULL;

-                return(NULL);

-        }

-        if((iobuf->out=sbuf_init(outsize))==NULL) {

-                sbuf_free(iobuf->in),iobuf->in=NULL;

-                free(iobuf),iobuf=NULL;

-                return(NULL);

-        }

-        return(iobuf);

-}

-

-siobuf *

-iobuf_staticinit(siobuf *uninitiobuf, sbuf *uninitinbuf, sbuf *uninitoutbuf,int insize, int outsize, char *inbuf, char *outbuf)

-{

-        memset(uninitiobuf,0,sizeof(siobuf));

-        if((uninitiobuf->in=sbuf_staticinit(uninitinbuf,insize,inbuf))==NULL)

-                return(NULL);

-        if((uninitiobuf->out=sbuf_staticinit(uninitoutbuf,outsize,outbuf))==NULL)

-                return(NULL);

-        return(uninitiobuf);

-}

-

-void

-iobuf_free(siobuf *iobuf)

-{

-        if(iobuf==NULL)

-                return;

-        if(iobuf->in!=NULL)

-                sbuf_free(iobuf->in),iobuf->in=NULL;

-        if(iobuf->out!=NULL)

-                sbuf_free(iobuf->out),iobuf->out=NULL;

-        free(iobuf);

-}

-

-void

-iobuf_staticfree(siobuf *iobuf)

-{

-        if(iobuf==NULL)

-                return;

-        sbuf_staticfree(iobuf->in),iobuf->in=NULL;

-        sbuf_staticfree(iobuf->out),iobuf->out=NULL;

-        return;

-}

-

-

deleted file mode 100644

@@ -1,35 +0,0 @@

-/*

- * iobuf.h

- *

- * An I/O buffer library based on sbuf.

- *

- * Header file.

- *

- * History:

- *      21/01/2014 Creation.

- *      12/03/2014 Fix _staticinit() and  _*free() prototypes.

- *

- * Author: Dario Rodriguez dario@softhome.net

- * This library is licensed on the terms of the GNU LGPL v2+

- */

-

-#ifndef IOBUF_H

-#define IOBUF_H

-

-#include "sbuf.h"

-

-typedef struct {

-        int iobufnum;

-        sbuf *in;

-        sbuf *out;

-} siobuf;

-

-/* iobuf */

-siobuf *iobuf_init(int insize,int outsize);

-siobuf *iobuf_staticinit(siobuf *uninitiobuf, sbuf *uninitinbuf, sbuf *uninitoutbuf,int insize, int outsize, char *inbuf, char *outbuf);

-

-void iobuf_free(siobuf *iobuf);

-void iobuf_staticfree(siobuf *iobuf);

-

-#endif

-

@@ -12,18 +12,27 @@

 #include <stdlib.h>

 #include <unistd.h>

 #include <string.h>

+#include "sbuf.h"

 #include "socklib.h"

 #include "webkernel.h"

 #define FDBLOCK 256

 #define CLIENTBLOCK 1024

 #define CLIENTBLOCKBLOCK 256

+#define MAXOUTBUF 128

+#define BUFSIZE 8192

+#define BUFBLOCK 128

+#define BUFBLOCKBLOCK 256

 typedef struct wk_client {

         wk *web;

-        int connid; /* it is numblock*CLIENTBLOCK+offset_in_block */

+        int connid; /* this is numblock*CLIENTBLOCK+offset_in_block */

         int fd;

+        int inbufid;

+        int sizeoutbufids;

+        int usedoutbufids;

+        int outbufids[MAXOUTBUF];

 } wk_client;

 typedef struct wk_clientblock {

@@ -33,6 +42,18 @@ typedef struct wk_clientblock {

         wk_client *clients;

 } wk_clientblock;

+typedef struct wk_buf {

+        sbuf buf;

+        char bufdata[BUFSIZE];

+} wk_buf;

+

+typedef struct wk_bufblock {

+        int sizebufs;

+        int usedbufs;

+        unsigned char acquired[BUFBLOCK/8];

+        wk_buf *bufs;

+} wk_bufblock;

+

 typedef struct _wk {

         int serverfd;

         fd_set fdset;

@@ -40,6 +61,9 @@ typedef struct _wk {

         int sizeclientblocks;

         int usedclientblocks;

         wk_clientblock *clientblocks;

+        int sizebufblocks;

+        int usedbufblocks;

+        wk_bufblock *bufblocks;

 } _wk;

 static int wk_accept(_wk *web);

@@ -63,6 +87,7 @@ wk_init(int port, sselect *ssel, void (*callback_event)(/*wk *paramweb,int conni

                 wk_free((wk *)web),web=NULL;

                 return(NULL);

         }

+        sock_setunsafe(web->serverfd);

         FD_SET(web->serverfd,&(web->fdset));

         sselect_addread(ssel,web->serverfd,NULL);

         return((wk *)web);

@@ -129,6 +154,7 @@ wk_service(wk *paramweb)

         int n;

         int i;

         _wk *web=(_wk *)paramweb;

+        wk_client *client;

         if(web==NULL)

                 return(-1);

         while((n=sselect_getreadfiltered(web,&(web->fdset),fds,sizeof(fds)/sizeof(fds[0])))>0) {

@@ -139,6 +165,9 @@ wk_service(wk *paramweb)

                                 wk_accept(web);

                                 continue;

                         }

+                        if((client=(wk_client *)sselect_getuserptr(web->ssel,fd))==NULL || client->web!=(wk *)web)

+                                continue; /* internal error */

+

                 }

         }

 }

@@ -245,18 +274,101 @@ mime_getdefault(const char *filename, const char *defaultmime)

         return(defaultmime);

 }

-siobuf *

-wk_iobufget(wk *paramweb)

+int

+wk_sbufacquire(wk *paramweb)

 {

-

+        int i,j,k;

+        wk_bufblock *bb;

+        sbuf *buf;

+        _wk *web=(_wk *)paramweb;

+        if(web==NULL)

+                return(-1);

+        /* make sure there are free bufblocks */

+        if(web->usedbufblocks==web->sizebufblocks) {

+                wk_bufblock *newbb;

+                if((newbb=(wk_bufblock *)realloc(web->bufblocks,web->sizebufblocks+BUFBLOCKBLOCK))==NULL)

+                        return(-1); /* insufficient memory */

+                web->bufblocks=newbb;

+                memset(web->bufblocks+web->sizebufblocks,0,BUFBLOCKBLOCK*sizeof(wk_bufblock));

+                web->sizebufblocks+=BUFBLOCKBLOCK;

+        }

+        /* search for a block with unused sbufs (or the first unalloc'd block) */

+        for(i=0;i<web->sizebufblocks;i++) {

+                bb=web->bufblocks+i;

+                if(bb->bufs==NULL || bb->usedbufs<bb->sizebufs)

+                        break;

+        }

+        if(i>=web->sizebufblocks)

+                return(-1); /* internal error */

+        /* alloc block if not alloc'd */

+        if(bb->bufs==NULL) {

+                if((bb->bufs=malloc(sizeof(wk_buf)*BUFBLOCK))==NULL)

+                        return(-1); /* insufficient memory */

+                memset(bb->bufs,0,sizeof(wk_buf)*BUFBLOCK);

+                bb->sizebufs=BUFBLOCK;

+                bb->usedbufs=0;

+        }

+        /* get first unused sbuf */

+        for(j=0;j<bb->sizebufs;j+=8) {

+                if(bb->acquired[j>>3]!=0xff)

+                        break;

+        }

+        if(j>=bb->sizebufs)

+                return(-1); /* internal error */

+        for(k=0x01;k<0x100;k<<=1,j++) {

+                if((bb->acquired[j>>3]&k)==0)

+                        break;

+        }

+        if(k>=0x100)

+                return(-1); /* internal error */

+        bb->acquired[j>>3]|=k;

+        bb->usedbufs++;

+        /* initialize sbuf and return it */

+        buf=&(bb->bufs[j].buf);

+        sbuf_staticinit(buf,BUFSIZE,bb->bufs[j].bufdata);

+        return(i*BUFBLOCK+j);

 }

-void

-wk_iobuffree(wk *paramweb, int iobufnum)

+int

+wk_bufrelease(wk *paramweb, int sbufid)

 {

+        sbuf *buf;

+        int numblock,j,bit;

+        _wk *web=(_wk *)paramweb;

+        if(web==NULL)

+                return(-1);

+        numblock=sbufid/BUFBLOCK;

+        j=sbufid%BUFBLOCK;

+        bit=0x1<<(j&3);

+        if((buf=wk_sbufget(web,sbufid))==NULL)

+                return(-1);

+        web->bufblocks[numblock].usedbufs--;

+        web->bufblocks[numblock].acquired[j>>3]&=(~bit);

+        sbuf_staticfree(buf);

+        memset(web->bufblocks[numblock].bufs[j].bufdata,0,sizeof(BUFSIZE));

+        return(0);

+}

+sbuf *

+wk_bufget(wk *paramweb, int sbufid)

+{

+        int numblock,j,bit;

+        _wk *web=(_wk *)paramweb;

+        if(web==NULL)

+                return(NULL);

+        numblock=sbufid/BUFBLOCK;

+        j=sbufid%BUFBLOCK;

+        bit=0x1<<(j&3);

+        if(web==NULL ||

+          web->bufblocks==NULL ||

+          web->sizebufblocks<=numblock ||

+          web->bufblocks[numblock].bufs==NULL ||

+          (web->bufblocks[numblock].acquired[j>>3]&bit)!=bit)

+                return(NULL);

+        return(&(web->bufblocks[numblock].bufs[j].buf));

 }

+

 /* local functions */

 static int

 wk_accept(_wk *web)

@@ -304,6 +416,7 @@ wk_clientacquire(_wk *web)

                         return(NULL); /* insufficient memory */

                 memset(cb->clients,0,sizeof(wk_client)*CLIENTBLOCK);

                 cb->sizeclients=CLIENTBLOCK;

+                cb->usedclients=0;

         }

         /* get first unused client */

         for(j=0;j<cb->sizeclients;j+=8) {

@@ -361,3 +474,4 @@ wk_clientget(_wk *web, int connid)

         return(web->clientblocks[numblock].clients+j);

 }

+

@@ -12,7 +12,7 @@

 #ifndef WEBKERNEL_H

 #define WEBKERNEL_H

 #include <sys/select.h>

-#include "iobuf.h"

+#include "sbuf.h"

 #include "socklib.h"

 typedef void wk;

@@ -57,7 +57,9 @@ char *wk_uri_getheaderbynum(wk_uri *wkuri, int num);

 const char *mime_getdefault(const char *filename, const char *defaultmime);

-siobuf *wk_iobufget(wk *web);

-void wk_iobuffree(wk *web, int iobufnum);

+

+int wk_sbufacquire(wk *web);

+sbuf *wk_sbufget(wk *web, int sbufid);

+void wk_sbufrelease(wk *web, int sbufid);

 #endif