7f0c7a29fd
With all the async connects and disconnects and error handling
going on in hiredis, we need to centralize how we close our fd
and set it so it doesn't get re-closed. Prior to this commit,
sometimes we'd close(fd), run an async error handler, then
call close(fd) again.
To stop multiple closes, we now set fd to -1 after we free it,
but that requires not passing fd as an independent argument to
functions.
This commit moves all fd usage to c->fd. Since the context
has a fd field and all functions receive the context, it makes
more sense to use the fd inside of c instead of passing along fd
as an independent argument.
Also, by only using c->fd, we can set c->fd after we close it to
signify we shouldn't re-close the same fd again.
This does change one semi-public interface function redisCheckSocketError()
to only take (context) instead of (context, fd). A search on github
returned zero occasions of people using redisCheckSocketError()
outside of net.{c,h} in hiredis itself.
Commit inspired by the bug report at:
https://groups.google.com/forum/#!topic/redis-db/mQm46XkIPOY
Thanks go out to Thijs for trying high-frequency reconnects on
a host that isn't there.
Closes #230
49 lines
2.2 KiB
C
49 lines
2.2 KiB
C
/* Extracted from anet.c to work properly with Hiredis error reporting.
|
|
*
|
|
* Copyright (c) 2006-2011, Salvatore Sanfilippo <antirez at gmail dot com>
|
|
* Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef __NET_H
|
|
#define __NET_H
|
|
|
|
#include "hiredis.h"
|
|
|
|
#if defined(__sun)
|
|
#define AF_LOCAL AF_UNIX
|
|
#endif
|
|
|
|
int redisCheckSocketError(redisContext *c);
|
|
int redisContextSetTimeout(redisContext *c, const struct timeval tv);
|
|
int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);
|
|
int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
|
|
int redisKeepAlive(redisContext *c, int interval);
|
|
|
|
#endif
|