]> granicus.if.org Git - libevent/commitdiff
Actually use the logic in select.c designed to make the out_sets threadsafe.
authorNick Mathewson <nickm@torproject.org>
Thu, 29 Oct 2009 16:35:15 +0000 (16:35 +0000)
committerNick Mathewson <nickm@torproject.org>
Thu, 29 Oct 2009 16:35:15 +0000 (16:35 +0000)
svn:r1475

select.c

index 0d06c726ebd7a4d0c295069cd69fcd9165b2149f..fcc4669f83e1ecaadeff0a81181f75da3f562adc 100644 (file)
--- a/select.c
+++ b/select.c
@@ -200,8 +200,6 @@ select_resize(struct selectop *sop, int fdsz)
 
        fd_set *readset_in = NULL;
        fd_set *writeset_in = NULL;
-       fd_set *readset_out = NULL;
-       fd_set *writeset_out = NULL;
 
        n_events = (fdsz/sizeof(fd_mask)) * NFDBITS;
        n_events_old = (sop->event_fdsz/sizeof(fd_mask)) * NFDBITS;
@@ -212,15 +210,10 @@ select_resize(struct selectop *sop, int fdsz)
        if ((readset_in = mm_realloc(sop->event_readset_in, fdsz)) == NULL)
                goto error;
        sop->event_readset_in = readset_in;
-       if ((readset_out = mm_realloc(sop->event_readset_out, fdsz)) == NULL)
-               goto error;
-       sop->event_readset_out = readset_out;
        if ((writeset_in = mm_realloc(sop->event_writeset_in, fdsz)) == NULL)
                goto error;
        sop->event_writeset_in = writeset_in;
-       if ((writeset_out = mm_realloc(sop->event_writeset_out, fdsz)) == NULL)
-               goto error;
-       sop->event_writeset_out = writeset_out;
+       sop->resize_out_sets = 1;
 
        memset((char *)sop->event_readset_in + sop->event_fdsz, 0,
            fdsz - sop->event_fdsz);