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

use skynet malloc api directly

Browse Source
This commit is contained in:
Cloud Wu
2014-04-22 12:26:08 +08:00
parent 08c511160f
commit 75a28b0fcc
19 changed files with 98 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
skynet-src/skynet_mq.c
View File

@@ -83,7 +83,7 @@ skynet_globalmq_pop() {
struct message_queue *
skynet_mq_create(uint32_t handle) {
struct message_queue *q = malloc(sizeof(*q));
struct message_queue *q = skynet_malloc(sizeof(*q));
q->handle = handle;
q->cap = DEFAULT_QUEUE_SIZE;
q->head = 0;
@@ -92,15 +92,15 @@ skynet_mq_create(uint32_t handle) {
q->in_global = MQ_IN_GLOBAL;
q->release = 0;
q->lock_session = 0;
q->queue = malloc(sizeof(struct skynet_message) * q->cap);
q->queue = skynet_malloc(sizeof(struct skynet_message) * q->cap);
return q;
}
static void
_release(struct message_queue *q) {
free(q->queue);
free(q);
skynet_free(q->queue);
skynet_free(q);
}
uint32_t
@@ -148,7 +148,7 @@ skynet_mq_pop(struct message_queue *q, struct skynet_message *message) {
static void
expand_queue(struct message_queue *q) {
struct skynet_message *new_queue = malloc(sizeof(struct skynet_message) * q->cap * 2);
struct skynet_message *new_queue = skynet_malloc(sizeof(struct skynet_message) * q->cap * 2);
int i;
for (i=0;i<q->cap;i++) {
new_queue[i] = q->queue[(q->head + i) % q->cap];
@@ -157,7 +157,7 @@ expand_queue(struct message_queue *q) {
q->tail = q->cap;
q->cap *= 2;
free(q->queue);
skynet_free(q->queue);
q->queue = new_queue;
}
@@ -239,10 +239,10 @@ skynet_mq_unlock(struct message_queue *q) {
void
skynet_mq_init() {
struct global_queue *q = malloc(sizeof(*q));
struct global_queue *q = skynet_malloc(sizeof(*q));
memset(q,0,sizeof(*q));
q->queue = malloc(MAX_GLOBAL_MQ * sizeof(struct message_queue *));
q->flag = malloc(MAX_GLOBAL_MQ * sizeof(bool));
q->queue = skynet_malloc(MAX_GLOBAL_MQ * sizeof(struct message_queue *));
q->flag = skynet_malloc(MAX_GLOBAL_MQ * sizeof(bool));
memset(q->flag, 0, sizeof(bool) * MAX_GLOBAL_MQ);
Q=q;
}
@@ -286,7 +286,7 @@ _drop_queue(struct message_queue *q) {
int s = 0;
while(!skynet_mq_pop(q, &msg)) {
++s;
free(msg.data);
skynet_free(msg.data);
}
_release(q);
return s;