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

timer support more than 497 days

Browse Source
This commit is contained in:
Cloud Wu
2014-08-08 20:33:38 +08:00
parent b18962929b
commit f6fa6c7ded
3 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@@ -1,3 +1,9 @@
v0.5.1 (2014-8-4)
-----------
* Bugfix : http module
* Bugfix : multicast local channel delete
* Bugfix : socket.read(fd)
v0.5.0 (2014-7-28) v0.5.0 (2014-7-28)
----------- -----------
* skynet.exit will quit service immediately. * skynet.exit will quit service immediately.

1
skynet-src/skynet_main.c
View File

@@ -89,7 +89,6 @@ static const char * load_config = "\
local code = assert(f:read \'*a\')\ local code = assert(f:read \'*a\')\
local function getenv(name) return assert(os.getenv(name), name) end\ local function getenv(name) return assert(os.getenv(name), name) end\
code = string.gsub(code, \'%$([%w_%d]+)\', getenv)\ code = string.gsub(code, \'%$([%w_%d]+)\', getenv)\
print(code)\
f:close()\ f:close()\
local result = {}\ local result = {}\
assert(load(code,\'=(load)\',\'t\',result))()\ assert(load(code,\'=(load)\',\'t\',result))()\

62
skynet-src/skynet_timer.c
View File

@@ -9,6 +9,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#if defined(__APPLE__) #if defined(__APPLE__)
#include <sys/time.h> #include <sys/time.h>
@@ -33,7 +34,7 @@ struct timer_event {
struct timer_node { struct timer_node {
struct timer_node *next; struct timer_node *next;
int expire; uint32_t expire;
}; };
struct link_list { struct link_list {
@@ -43,9 +44,9 @@ struct link_list {
struct timer { struct timer {
struct link_list near[TIME_NEAR]; struct link_list near[TIME_NEAR];
struct link_list t[4][TIME_LEVEL-1]; struct link_list t[4][TIME_LEVEL];
int lock; int lock;
int time; uint32_t time;
uint32_t current; uint32_t current;
uint32_t starttime; uint32_t starttime;
uint64_t current_point; uint64_t current_point;
@@ -72,21 +73,22 @@ link(struct link_list *list,struct timer_node *node) {
static void static void
add_node(struct timer *T,struct timer_node *node) { add_node(struct timer *T,struct timer_node *node) {
int time=node->expire; uint32_t time=node->expire;
int current_time=T->time; uint32_t current_time=T->time;
if ((time|TIME_NEAR_MASK)==(current_time|TIME_NEAR_MASK)) { if ((time|TIME_NEAR_MASK)==(current_time|TIME_NEAR_MASK)) {
link(&T->near[time&TIME_NEAR_MASK],node); link(&T->near[time&TIME_NEAR_MASK],node);
} else { } else {
int i; int i;
int mask=TIME_NEAR << TIME_LEVEL_SHIFT; uint32_t mask=TIME_NEAR << TIME_LEVEL_SHIFT;
for (i=0;i<3;i++) { for (i=0;i<3;i++) {
if ((time|(mask-1))==(current_time|(mask-1))) { if ((time|(mask-1))==(current_time|(mask-1))) {
break; break;
} }
mask <<= TIME_LEVEL_SHIFT; mask <<= TIME_LEVEL_SHIFT;
} }
link(&T->t[i][((time>>(TIME_NEAR_SHIFT + i*TIME_LEVEL_SHIFT)) & TIME_LEVEL_MASK)-1],node);
link(&T->t[i][((time>>(TIME_NEAR_SHIFT + i*TIME_LEVEL_SHIFT)) & TIME_LEVEL_MASK)],node);
} }
} }
@@ -103,29 +105,38 @@ timer_add(struct timer *T,void *arg,size_t sz,int time) {
UNLOCK(T); UNLOCK(T);
} }
static void
move_list(struct timer *T, int level, int idx) {
struct timer_node *current = link_clear(&T->t[level][idx]);
while (current) {
struct timer_node *temp=current->next;
add_node(T,current);
current=temp;
}
}
static void static void
timer_shift(struct timer *T) { timer_shift(struct timer *T) {
LOCK(T); LOCK(T);
int mask = TIME_NEAR; int mask = TIME_NEAR;
int time = (++T->time) >> TIME_NEAR_SHIFT; uint32_t ct = ++T->time;
int i=0; if (ct == 0) {
move_list(T, 3, 0);
while ((T->time & (mask-1))==0) { } else {
int idx=time & TIME_LEVEL_MASK; uint32_t time = ct >> TIME_NEAR_SHIFT;
if (idx!=0) { int i=0;
--idx;
struct timer_node *current = link_clear(&T->t[i][idx]); while ((ct & (mask-1))==0) {
while (current) { int idx=time & TIME_LEVEL_MASK;
struct timer_node *temp=current->next; if (idx!=0) {
add_node(T,current); move_list(T, i, idx);
current=temp; break;
} }
break; mask <<= TIME_LEVEL_SHIFT;
time >>= TIME_LEVEL_SHIFT;
++i;
} }
mask <<= TIME_LEVEL_SHIFT; }
time >>= TIME_LEVEL_SHIFT;
++i;
}
UNLOCK(T); UNLOCK(T);
} }
@@ -187,7 +198,7 @@ timer_create_timer() {
} }
for (i=0;i<4;i++) { for (i=0;i<4;i++) {
for (j=0;j<TIME_LEVEL-1;j++) { for (j=0;j<TIME_LEVEL;j++) {
link_clear(&r->t[i][j]); link_clear(&r->t[i][j]);
} }
} }
@@ -265,6 +276,7 @@ skynet_updatetime(void) {
uint64_t cp = gettime(); uint64_t cp = gettime();
if(cp < TI->current_point) { if(cp < TI->current_point) {
skynet_error(NULL, "time diff error: change from %lld to %lld", cp, TI->current_point); skynet_error(NULL, "time diff error: change from %lld to %lld", cp, TI->current_point);
TI->current_point = cp;
} else if (cp != TI->current_point) { } else if (cp != TI->current_point) {
uint32_t diff = (uint32_t)(cp - TI->current_point); uint32_t diff = (uint32_t)(cp - TI->current_point);
TI->current_point = cp; TI->current_point = cp;