cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 05:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace more C99/C++ comments with oldschool /* */ comments

Browse Source
This commit is contained in:
Nick Mathewson 2012-02-02 11:45:23 -05:00
parent 7c46d4aa63
commit 4dee4cc7e1
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
buffer.c
View File

@ -188,19 +188,19 @@ evbuffer_chain_free(struct evbuffer_chain *chain)
{ {
EVUTIL_ASSERT(chain->refcnt > 0); EVUTIL_ASSERT(chain->refcnt > 0);
if (--chain->refcnt > 0) { if (--chain->refcnt > 0) {
// chain is still referenced by other chains /* chain is still referenced by other chains */
return; return;
} }
if (CHAIN_PINNED(chain)) { if (CHAIN_PINNED(chain)) {
// will get freed once no longer dangling /* will get freed once no longer dangling */
chain->refcnt++; chain->refcnt++;
chain->flags |= EVBUFFER_DANGLING; chain->flags |= EVBUFFER_DANGLING;
return; return;
} }
// safe to release chain, it's either a referencing /* safe to release chain, it's either a referencing
// chain or all references to it have been freed * chain or all references to it have been freed */
if (chain->flags & EVBUFFER_REFERENCE) { if (chain->flags & EVBUFFER_REFERENCE) {
struct evbuffer_chain_reference *info = struct evbuffer_chain_reference *info =
EVBUFFER_CHAIN_EXTRA( EVBUFFER_CHAIN_EXTRA(
@ -229,10 +229,10 @@ evbuffer_chain_free(struct evbuffer_chain *chain)
EVBUFFER_CHAIN_EXTRA( EVBUFFER_CHAIN_EXTRA(
struct evbuffer_multicast_parent, struct evbuffer_multicast_parent,
chain); chain);
// referencing chain is being freed, decrease /* referencing chain is being freed, decrease
// refcounts of source chain and associated * refcounts of source chain and associated
// evbuffer (which get freed once both reach * evbuffer (which get freed once both reach
// zero) * zero) */
EVUTIL_ASSERT(info->source != NULL); EVUTIL_ASSERT(info->source != NULL);
EVUTIL_ASSERT(info->parent != NULL); EVUTIL_ASSERT(info->parent != NULL);
EVBUFFER_LOCK(info->source); EVBUFFER_LOCK(info->source);
@ -898,7 +898,7 @@ APPEND_CHAIN_MULTICAST(struct evbuffer *dst, struct evbuffer *src)
for (; chain; chain = chain->next) { for (; chain; chain = chain->next) {
if (!chain->off || chain->flags & EVBUFFER_DANGLING) { if (!chain->off || chain->flags & EVBUFFER_DANGLING) {
// skip empty chains /* skip empty chains */
continue; continue;
} }
@ -908,12 +908,12 @@ APPEND_CHAIN_MULTICAST(struct evbuffer *dst, struct evbuffer *src)
return; return;
} }
extra = EVBUFFER_CHAIN_EXTRA(struct evbuffer_multicast_parent, tmp); extra = EVBUFFER_CHAIN_EXTRA(struct evbuffer_multicast_parent, tmp);
// reference evbuffer containing source chain so it /* reference evbuffer containing source chain so it
// doesn't get released while the chain is still * doesn't get released while the chain is still
// being referenced to * being referenced to */
_evbuffer_incref(src); _evbuffer_incref(src);
extra->source = src; extra->source = src;
// reference source chain which now becomes immutable /* reference source chain which now becomes immutable */
evbuffer_chain_incref(chain); evbuffer_chain_incref(chain);
extra->parent = chain; extra->parent = chain;
chain->flags |= EVBUFFER_IMMUTABLE; chain->flags |= EVBUFFER_IMMUTABLE;
@ -1012,7 +1012,7 @@ evbuffer_add_buffer_reference(struct evbuffer *outbuf, struct evbuffer *inbuf)
for (; chain; chain = chain->next) { for (; chain; chain = chain->next) {
if ((chain->flags & (EVBUFFER_FILESEGMENT|EVBUFFER_SENDFILE|EVBUFFER_MULTICAST)) != 0) { if ((chain->flags & (EVBUFFER_FILESEGMENT|EVBUFFER_SENDFILE|EVBUFFER_MULTICAST)) != 0) {
// chain type can not be referenced /* chain type can not be referenced */
result = -1; result = -1;
goto done; goto done;
} }

4
evport.c
View File

@ -291,7 +291,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
if (fdi != NULL && FDI_HAS_EVENTS(fdi)) { if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
reassociate(epdp, fdi, fd); reassociate(epdp, fdi, fd);
// epdp->ed_pending[i] = -1; /* epdp->ed_pending[i] = -1; */
fdi->pending_idx_plus_1 = 0; fdi->pending_idx_plus_1 = 0;
} }
} }
@ -321,7 +321,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
port_event_t *pevt = &pevtlist[i]; port_event_t *pevt = &pevtlist[i];
int fd = (int) pevt->portev_object; int fd = (int) pevt->portev_object;
struct fd_info *fdi = pevt->portev_user; struct fd_info *fdi = pevt->portev_user;
//EVUTIL_ASSERT(evmap_io_get_fdinfo(&base->io, fd) == fdi); /*EVUTIL_ASSERT(evmap_io_get_fdinfo(&base->io, fd) == fdi);*/
check_evportop(epdp); check_evportop(epdp);
check_event(pevt); check_event(pevt);

4
test/regress_buffer.c
View File

@ -1619,11 +1619,11 @@ test_evbuffer_multicast(void *ptr)
tt_assert(buf2); tt_assert(buf2);
tt_int_op(evbuffer_add_buffer_reference(buf2, buf1), ==, 0); tt_int_op(evbuffer_add_buffer_reference(buf2, buf1), ==, 0);
// nested references are not allowed /* nested references are not allowed */
tt_int_op(evbuffer_add_buffer_reference(buf2, buf2), ==, -1); tt_int_op(evbuffer_add_buffer_reference(buf2, buf2), ==, -1);
tt_int_op(evbuffer_add_buffer_reference(buf1, buf2), ==, -1); tt_int_op(evbuffer_add_buffer_reference(buf1, buf2), ==, -1);
// both buffers contain the same amount of data /* both buffers contain the same amount of data */
tt_int_op(evbuffer_get_length(buf1), ==, evbuffer_get_length(buf1)); tt_int_op(evbuffer_get_length(buf1), ==, evbuffer_get_length(buf1));
/* Make sure we can drain a little from the first buffer. */ /* Make sure we can drain a little from the first buffer. */