diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-02-27 18:36:39 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-08 09:27:30 +1000 |
| commit | ddc11397a56c745b5d1fb377e9d9b1fcc73802c8 (patch) | |
| tree | eab04fa8848e82038e31a1d4a1c9712bf3028b98 /dix | |
| parent | 6993f8b459e25b1a7a0a03e209688a28ce6c2c56 (diff) | |
dix: delete all callbacks before reset
DeleteCallbackManager() introduced for better symmetry in the caller, they
do the same thing.
==20085== 24 bytes in 1 blocks are still reachable in loss record 11 of 103
==20085== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==20085== by 0x43A097: CreateCallbackList (dixutils.c:837)
==20085== by 0x43A1D3: AddCallback (dixutils.c:869)
==20085== by 0x4B1736: GEExtensionInit (geext.c:209)
==20085== by 0x41C8A8: InitExtensions (miinitext.c:389)
==20085== by 0x5AC918: main (main.c:208)
==2042== 8 bytes in 1 blocks are still reachable in loss record 2 of 97
==2042== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==2042== by 0x4C2A657: realloc (vg_replace_malloc.c:525)
==2042== by 0x4802F5: XNFrealloc (utils.c:1095)
==2042== by 0x43A17A: CreateCallbackList (dixutils.c:855)
==2042== by 0x43A1EF: AddCallback (dixutils.c:870)
==2042== by 0x4B1752: GEExtensionInit (geext.c:209)
==2042== by 0x41C8A8: InitExtensions (miinitext.c:389)
==2042== by 0x5AC9E4: main (main.c:208)
==2042==
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dixutils.c | 8 | ||||
| -rw-r--r-- | dix/main.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index 3f24629b4..c250bb1db 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -849,7 +849,7 @@ DeleteCallbackList(CallbackListPtr *pcbl) } void -InitCallbackManager(void) +DeleteCallbackManager(void) { int i; @@ -861,3 +861,9 @@ InitCallbackManager(void) numCallbackListsToCleanup = 0; listsToCleanup = NULL; } + +void +InitCallbackManager(void) +{ + DeleteCallbackManager(); +} diff --git a/dix/main.c b/dix/main.c index 1fa05040f..e69cd931f 100644 --- a/dix/main.c +++ b/dix/main.c @@ -366,6 +366,8 @@ main(int argc, char *argv[], char *envp[]) FreeAuditTimer(); + DeleteCallbackManager(); + if (dispatchException & DE_TERMINATE) { CloseWellKnownConnections(); } |