Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
c69ad1f2
Commit
c69ad1f2
authored
Jan 25, 2012
by
antirez
Browse files
Merge branch 'unstable' into limits
parents
2f0f0d95
ecc57021
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ae.c
View file @
c69ad1f2
...
@@ -56,32 +56,30 @@ aeEventLoop *aeCreateEventLoop(int setsize) {
...
@@ -56,32 +56,30 @@ aeEventLoop *aeCreateEventLoop(int setsize) {
aeEventLoop
*
eventLoop
;
aeEventLoop
*
eventLoop
;
int
i
;
int
i
;
if
((
eventLoop
=
zmalloc
(
sizeof
(
*
eventLoop
)))
==
NULL
)
return
NULL
;
if
((
eventLoop
=
zmalloc
(
sizeof
(
*
eventLoop
)))
==
NULL
)
goto
err
;
eventLoop
->
events
=
NULL
;
eventLoop
->
fired
=
NULL
;
eventLoop
->
events
=
zmalloc
(
sizeof
(
aeFileEvent
)
*
setsize
);
eventLoop
->
events
=
zmalloc
(
sizeof
(
aeFileEvent
)
*
setsize
);
eventLoop
->
fired
=
zmalloc
(
sizeof
(
aeFiredEvent
)
*
setsize
);
eventLoop
->
fired
=
zmalloc
(
sizeof
(
aeFiredEvent
)
*
setsize
);
if
(
eventLoop
->
events
==
NULL
||
eventLoop
->
fired
==
NULL
)
{
if
(
eventLoop
->
events
==
NULL
||
eventLoop
->
fired
==
NULL
)
goto
err
;
zfree
(
eventLoop
->
events
);
zfree
(
eventLoop
->
fired
);
zfree
(
eventLoop
);
return
NULL
;
}
eventLoop
->
setsize
=
setsize
;
eventLoop
->
setsize
=
setsize
;
eventLoop
->
timeEventHead
=
NULL
;
eventLoop
->
timeEventHead
=
NULL
;
eventLoop
->
timeEventNextId
=
0
;
eventLoop
->
timeEventNextId
=
0
;
eventLoop
->
stop
=
0
;
eventLoop
->
stop
=
0
;
eventLoop
->
maxfd
=
-
1
;
eventLoop
->
maxfd
=
-
1
;
eventLoop
->
beforesleep
=
NULL
;
eventLoop
->
beforesleep
=
NULL
;
if
(
aeApiCreate
(
eventLoop
)
==
-
1
)
{
if
(
aeApiCreate
(
eventLoop
)
==
-
1
)
goto
err
;
zfree
(
eventLoop
);
return
NULL
;
}
/* Events with mask == AE_NONE are not set. So let's initialize the
/* Events with mask == AE_NONE are not set. So let's initialize the
* vector with it. */
* vector with it. */
for
(
i
=
0
;
i
<
setsize
;
i
++
)
for
(
i
=
0
;
i
<
setsize
;
i
++
)
eventLoop
->
events
[
i
].
mask
=
AE_NONE
;
eventLoop
->
events
[
i
].
mask
=
AE_NONE
;
return
eventLoop
;
return
eventLoop
;
err:
if
(
eventLoop
)
{
zfree
(
eventLoop
->
events
);
zfree
(
eventLoop
->
fired
);
zfree
(
eventLoop
);
}
return
NULL
;
}
}
void
aeDeleteEventLoop
(
aeEventLoop
*
eventLoop
)
{
void
aeDeleteEventLoop
(
aeEventLoop
*
eventLoop
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment