lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

We don't need hash map in gate

Browse Source
This commit is contained in:
云风
2012-08-07 13:47:19 +08:00
parent 8bcc7dce01
commit 0afda95801
4 changed files with 19 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -9,7 +9,7 @@ logger.so : skynet_logger.c
snlua.so : service_lua.c snlua.so : service_lua.c
gcc -Wall -g -fPIC --shared $^ -o $@ gcc -Wall -g -fPIC --shared $^ -o $@
gate.so : gate/mread.c gate/ringbuffer.c gate/map.c gate/main.c gate.so : gate/mread.c gate/ringbuffer.c gate/main.c
gcc -Wall -g -fPIC --shared -o $@ $^ -I. -Igate gcc -Wall -g -fPIC --shared -o $@ $^ -I. -Igate
skynet.so : lua-skynet.c skynet.so : lua-skynet.c

139
gate/map.c
View File

@@ -1,139 +0,0 @@
#include "map.h"
#include <stdlib.h>
#include <assert.h>
#include <stdio.h>
struct node {
int fd;
int id;
struct node * next;
};
struct map {
int size;
struct node * hash;
};
struct map *
map_new(int max) {
int sz = 1;
while (sz <= max) {
sz *= 2;
}
struct map * m = malloc(sizeof(*m));
m->size = sz;
m->hash = malloc(sizeof(struct node) * sz);
int i;
for (i=0;i<sz;i++) {
m->hash[i].fd = -1;
m->hash[i].id = 0;
m->hash[i].next = NULL;
}
return m;
}
void
map_delete(struct map * m) {
free(m->hash);
free(m);
}
int
map_search(struct map * m, int fd) {
int hash = fd & (m->size-1);
struct node * n = &m->hash[hash];
do {
if (n->fd == fd)
return n->id;
n = n->next;
} while(n);
return -1;
}
void
map_insert(struct map * m, int fd, int id) {
int hash = fd & (m->size-1);
struct node * n = &m->hash[hash];
if (n->fd < 0) {
n->fd = fd;
n->id = id;
return;
}
int ohash = n->fd & (m->size-1);
if (hash != ohash) {
struct node * last = &m->hash[ohash];
while (last->next != &m->hash[hash]) {
last = last->next;
}
last->next = n->next;
int ofd = n->fd;
int oid = n->id;
n->fd = fd;
n->id = id;
n->next = NULL;
map_insert(m,ofd, oid);
return;
}
int last = (n - m->hash) * 2;
int i;
for (i=0;i<m->size;i++) {
int idx = (i + last + 1) & (m->size - 1);
struct node * temp = &m->hash[idx];
if (temp->fd < 0) {
temp->fd = fd;
temp->id = id;
temp->next = n->next;
n->next = temp;
return;
}
}
assert(0);
}
void
map_erase(struct map *m , int fd) {
int hash = fd & (m->size-1);
struct node * n = &m->hash[hash];
if (n->fd == fd) {
if (n->next == NULL) {
n->fd = -1;
return;
}
struct node * next = n->next;
n->fd = next->fd;
n->id = next->id;
n->next = next->next;
next->fd = -1;
next->next = NULL;
return;
}
if (n->next == NULL) {
return;
}
struct node * last = n;
n = n->next;
for(;;) {
if (n->fd == fd) {
n->fd = -1;
last->next = n->next;
n->next = NULL;
return;
}
if (n->next == NULL)
return;
last = n;
n = n->next;
}
}
void
map_dump(struct map *m) {
int i;
for (i=0;i<m->size;i++) {
struct node * n = &(m->hash[i]);
printf("[%d] fd = %d , id = %d , next = %d\n",i,n->fd,n->id,(int)(n->next - m->hash));
}
}

13
gate/map.h
View File

@@ -1,13 +0,0 @@
#ifndef MREAD_MAP_H
#define MREAD_MAP_H
struct map;
struct map * map_new(int max);
void map_delete(struct map *);
int map_search(struct map * , int fd);
void map_insert(struct map * , int fd, int id);
void map_erase(struct map *, int fd);
void map_dump(struct map *m);
#endif

39
gate/mread.c
View File

@@ -28,6 +28,8 @@
#define SOCKET_ALIVE SOCKET_SUSPEND #define SOCKET_ALIVE SOCKET_SUSPEND
#define LISTENSOCKET (void *)((intptr_t)~0)
struct socket { struct socket {
int fd; int fd;
struct ringbuffer_block * node; struct ringbuffer_block * node;
@@ -44,7 +46,6 @@ struct mread_pool {
int skip; int skip;
struct socket * sockets; struct socket * sockets;
struct socket * free_socket; struct socket * free_socket;
struct map * socket_hash;
int queue_len; int queue_len;
int queue_head; int queue_head;
struct epoll_event ev[READQUEUE]; struct epoll_event ev[READQUEUE];
@@ -125,9 +126,11 @@ mread_create(int port , int max , int buffer_size) {
close(listen_fd); close(listen_fd);
return NULL; return NULL;
} }
struct epoll_event ev; struct epoll_event ev;
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.fd = listen_fd; ev.data.ptr = LISTENSOCKET;
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, listen_fd, &ev) == -1) { if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, listen_fd, &ev) == -1) {
close(listen_fd); close(listen_fd);
close(epoll_fd); close(epoll_fd);
@@ -135,6 +138,7 @@ mread_create(int port , int max , int buffer_size) {
} }
struct mread_pool * self = malloc(sizeof(*self)); struct mread_pool * self = malloc(sizeof(*self));
self->listen_fd = listen_fd; self->listen_fd = listen_fd;
self->epoll_fd = epoll_fd; self->epoll_fd = epoll_fd;
self->max_connection = max; self->max_connection = max;
@@ -143,7 +147,6 @@ mread_create(int port , int max , int buffer_size) {
self->skip = 0; self->skip = 0;
self->sockets = _create_sockets(max); self->sockets = _create_sockets(max);
self->free_socket = &self->sockets[0]; self->free_socket = &self->sockets[0];
self->socket_hash = map_new(max * 3 / 2);
self->queue_len = 0; self->queue_len = 0;
self->queue_head = 0; self->queue_head = 0;
if (buffer_size == 0) { if (buffer_size == 0) {
@@ -172,7 +175,6 @@ mread_close(struct mread_pool *self) {
} }
close(self->epoll_fd); close(self->epoll_fd);
_release_rb(self->rb); _release_rb(self->rb);
map_delete(self->socket_hash);
free(self); free(self);
} }
@@ -188,12 +190,12 @@ _read_queue(struct mread_pool * self, int timeout) {
return n; return n;
} }
inline static int inline static struct socket *
_read_one(struct mread_pool * self) { _read_one(struct mread_pool * self) {
if (self->queue_head >= self->queue_len) { if (self->queue_head >= self->queue_len) {
return -1; return NULL;
} }
return self->ev[self->queue_head ++].data.fd; return self->ev[self->queue_head ++].data.ptr;
} }
static struct socket * static struct socket *
@@ -220,7 +222,7 @@ _add_client(struct mread_pool * self, int fd) {
} }
struct epoll_event ev; struct epoll_event ev;
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.fd = fd; ev.data.ptr = s;
if (epoll_ctl(self->epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) { if (epoll_ctl(self->epoll_fd, EPOLL_CTL_ADD, fd, &ev) == -1) {
close(fd); close(fd);
return; return;
@@ -229,8 +231,6 @@ _add_client(struct mread_pool * self, int fd) {
s->fd = fd; s->fd = fd;
s->node = NULL; s->node = NULL;
s->status = SOCKET_SUSPEND; s->status = SOCKET_SUSPEND;
int id = s - self->sockets;
map_insert(self->socket_hash , fd , id);
} }
static int static int
@@ -265,12 +265,12 @@ mread_poll(struct mread_pool * self , int timeout) {
} }
} }
for (;;) { for (;;) {
int fd = _read_one(self); struct socket * s = _read_one(self);
if (fd == -1) { if (s == NULL) {
self->active = -1; self->active = -1;
return -1; return -1;
} }
if (fd == self->listen_fd) { if (s == LISTENSOCKET) {
struct sockaddr_in remote_addr; struct sockaddr_in remote_addr;
socklen_t len = sizeof(struct sockaddr_in); socklen_t len = sizeof(struct sockaddr_in);
int client_fd = accept(self->listen_fd , (struct sockaddr *)&remote_addr , &len); int client_fd = accept(self->listen_fd , (struct sockaddr *)&remote_addr , &len);
@@ -279,13 +279,11 @@ mread_poll(struct mread_pool * self , int timeout) {
_add_client(self, client_fd); _add_client(self, client_fd);
} }
} else { } else {
int index = map_search(self->socket_hash , fd); int index = s - self->sockets;
if (index >= 0) { assert(index >=0 && index < self->max_connection);
self->active = index; self->active = index;
struct socket * s = &self->sockets[index]; s->status = SOCKET_POLLIN;
s->status = SOCKET_POLLIN; return index;
return index;
}
} }
} }
} }
@@ -456,7 +454,6 @@ mread_yield(struct mread_pool * self) {
if (s->status == SOCKET_CLOSED && s->node == NULL) { if (s->status == SOCKET_CLOSED && s->node == NULL) {
--self->closed; --self->closed;
s->status = SOCKET_INVALID; s->status = SOCKET_INVALID;
map_erase(self->socket_hash , s->fd);
s->fd = self->free_socket - self->sockets; s->fd = self->free_socket - self->sockets;
self->free_socket = s; self->free_socket = s;
self->skip = 0; self->skip = 0;