summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-08-07 04:12:07 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-08-07 04:12:07 +0000
commit2547d07ea35c382f6a7dcd191f21516cac5c7240 (patch)
tree2e7da2628af9d5be8f81cb23240009f569026e0a
parenta85e67559e135eb55f768265929e7f97fc47c54e (diff)
eio: properly shutdown monitor.
SVN revision: 74957
-rw-r--r--legacy/eio/ChangeLog4
-rw-r--r--legacy/eio/NEWS1
-rw-r--r--legacy/eio/src/lib/eio_main.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/legacy/eio/ChangeLog b/legacy/eio/ChangeLog
index 622fc60b38..3f0552f733 100644
--- a/legacy/eio/ChangeLog
+++ b/legacy/eio/ChangeLog
@@ -13,3 +13,7 @@
132012-08-02 Cedric Bail 132012-08-02 Cedric Bail
14 14
15 * Fix a memory leak when shutting down fallback monitor. 15 * Fix a memory leak when shutting down fallback monitor.
16
172012-08-07 Cedric Bail
18
19 * Properly shutdown monitor when calling eio_shutdown.
diff --git a/legacy/eio/NEWS b/legacy/eio/NEWS
index 1effea4a75..551f4d59f6 100644
--- a/legacy/eio/NEWS
+++ b/legacy/eio/NEWS
@@ -9,6 +9,7 @@ Fixes:
9 - build out of tree. 9 - build out of tree.
10 - detect when requesting to monitor a different file with the same name. 10 - detect when requesting to monitor a different file with the same name.
11 - memory leak when shutting down fallback monitor. 11 - memory leak when shutting down fallback monitor.
12 - properly shutdown monitor.
12 13
13Improvements: 14Improvements:
14 15
diff --git a/legacy/eio/src/lib/eio_main.c b/legacy/eio/src/lib/eio_main.c
index 47ea55bb63..591dcca5f1 100644
--- a/legacy/eio/src/lib/eio_main.c
+++ b/legacy/eio/src/lib/eio_main.c
@@ -245,6 +245,8 @@ eio_shutdown(void)
245 245
246 if (_eio_count > 0) return _eio_count; 246 if (_eio_count > 0) return _eio_count;
247 247
248 eio_monitor_shutdown();
249
248 EIO_MUTEX_DESTROY(direct_info_pool); 250 EIO_MUTEX_DESTROY(direct_info_pool);
249 EIO_MUTEX_DESTROY(progress_pool); 251 EIO_MUTEX_DESTROY(progress_pool);
250 EIO_MUTEX_DESTROY(char_pool); 252 EIO_MUTEX_DESTROY(char_pool);