diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-16 01:00:05 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-16 01:00:05 +0000 |
commit | a469f8a57669e1948d5cc29005d8c097312de63a (patch) | |
tree | 4af697f80e08ff9f10989840ea8a2669b73b8e08 /cups/globals.c | |
parent | 76aa1ac14cceecf4968355e1ea6af822bce9cfc3 (diff) |
Merge changes from CUPS 1.7svn-r10704.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4027 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/globals.c')
-rw-r--r-- | cups/globals.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cups/globals.c b/cups/globals.c index d7bd5ac50..eed949f83 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -38,6 +38,10 @@ */ +#ifdef DEBUG +static int cups_global_index = 0; + /* Next thread number */ +#endif /* DEBUG */ static _cups_threadkey_t cups_globals_key = _CUPS_THREADKEY_INITIALIZER; /* Thread local storage key */ #ifdef HAVE_PTHREAD_H @@ -216,6 +220,14 @@ cups_globals_alloc(void) cg->expired_certs = 1; cg->expired_root = 1; +#ifdef DEBUG + /* + * Friendly thread ID for debugging... + */ + + cg->thread_id = ++ cups_global_index; +#endif /* DEBUG */ + /* * Then set directories as appropriate... */ |