merge && test for master

This commit is contained in:
Carl-Benedikt Krüger 2011-08-02 13:19:12 +02:00
parent 1ec632145b
commit c8badae6ad

View file

@ -150,36 +150,19 @@ void srv_on_disc(ServerEventArgs*e )
}
void srv_on_conn(ServerEventArgs* e)
{
kprintf("someone finally connected\n");
}
#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
void* server_task(void* e)
{
int i = 0, err = 0;
int tmp1,tmp2;
char buff[32];
Server srv;
server_init(&srv,5555,2);
kprintf("created server\n");
srv._OnRead = srv_on_read;
srv._OnDisconnect = srv_on_disc;
srv._OnConnect = srv_on_conn;
sleep(5);
SHELLDEBUGPRINTF("sending...\n");
srv_sendBuffer(&srv,0,"Hello you!",sizeof("Hello you!"));
sleep(1);
kprintf("someone finally connected\n");
tmp1 = get_clock_tick();
for (i = 0; i < 1024*4*4*4; i++)
{
sleep(1);
err = srv_sendBuffer(&srv,0,buff,sizeof(buff));
err = srv_sendBuffer(&srv,e->ClientID,buff,sizeof(buff));
if ( err < 0)
SHELLDEBUGPRINTF("err: %d", err);
@ -191,6 +174,22 @@ void* server_task(void* e)
tmp2 = get_clock_tick();
kprintf("send with %f kb/s", ((float)i*sizeof(buff))/(tmp2-tmp1));
}
#define SHELLDEBUGPRINTF(x,...) kprintf(x,##__VA_ARGS__);
void* server_task(void* e)
{
Server srv;
server_init(&srv,5555,2);
kprintf("created server\n");
srv._OnRead = srv_on_read;
srv._OnDisconnect = srv_on_disc;
srv._OnConnect = srv_on_conn;
while(1)
sleep(2);
return NULL;