mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

#5891: Move UDP shutdown timer setup to sessionCloseImplStart

This commit is contained in:
Mike Gelfand 2015-12-31 14:24:15 +00:00
parent d3f5b5d5ab
commit 7d30ad3ff6
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libtransmission/session.c
View File

@ -1780,6 +1780,11 @@ compareTorrentByCur (const void * va, const void * vb)
static void closeBlocklists (tr_session *);
static void
sessionCloseImplWaitForIdleUdp (evutil_socket_t foo UNUSED,
short bar UNUSED,
void * vsession);
static void
sessionCloseImplStart (tr_session * session)
{
@ -1826,26 +1831,15 @@ sessionCloseImplStart (tr_session * session)
tr_cacheFree (session->cache);
session->cache = NULL;
/* saveTimer is not used at this point, reusing for UDP shutdown wait */
assert (session->saveTimer == NULL);
session->saveTimer = evtimer_new (session->event_base, sessionCloseImplWaitForIdleUdp, session);
tr_timerAdd (session->saveTimer, 0, 0);
}
static void
sessionCloseImplFinish (tr_session * session)
{
/* we had to wait until UDP trackers were closed before closing these: */
evdns_base_free (session->evdns_base, 0);
session->evdns_base = NULL;
tr_tracker_udp_close (session);
tr_udpUninit (session);
tr_statsClose (session);
tr_peerMgrFree (session->peerMgr);
closeBlocklists (session);
tr_fdClose (session);
session->isClosed = true;
}
sessionCloseImplFinish (tr_session * session);
static void
sessionCloseImplWaitForIdleUdp (evutil_socket_t foo UNUSED,
@ -1868,6 +1862,25 @@ sessionCloseImplWaitForIdleUdp (evutil_socket_t foo UNUSED,
sessionCloseImplFinish (session);
}
static void
sessionCloseImplFinish (tr_session * session)
{
/* we had to wait until UDP trackers were closed before closing these: */
evdns_base_free (session->evdns_base, 0);
session->evdns_base = NULL;
tr_tracker_udp_close (session);
tr_udpUninit (session);
tr_statsClose (session);
tr_peerMgrFree (session->peerMgr);
closeBlocklists (session);
tr_fdClose (session);
session->isClosed = true;
}
static void
sessionCloseImpl (void * vsession)
{
@ -1876,11 +1889,6 @@ sessionCloseImpl (void * vsession)
assert (tr_isSession (session));
sessionCloseImplStart (session);
/* saveTimer is not used at this point, reusing for UDP shutdown wait */
assert (session->saveTimer == NULL);
session->saveTimer = evtimer_new (session->event_base, sessionCloseImplWaitForIdleUdp, session);
tr_timerAdd (session->saveTimer, 0, 0);
}
static int