Make freelist_len in memarea.c static; document a few variables. (b4d387c2) · Commits · David Goulet / Tor

src/common/compat.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1829,9 +1829,11 @@ tor_get_thread_id(void)
		return (unsigned long)GetCurrentThreadId();
		}
		#elif defined(USE_PTHREADS)
		/* DOCDOC attr_reentrant */
		/** A mutex attribute that we're going to use to tell pthreads that we want
		* "reentrant" mutexes (i.e., once we can re-lock if we're already holding
		* them.) */
		static pthread_mutexattr_t attr_reentrant;
		/* DOCDOC threads_initialized */
		/** True iff we've called tor_threads_init() */
		static int threads_initialized = 0;
		/** Initialize <b>mutex</b> so it can be locked. Every mutex must be set
		* up eith tor_mutex_init() or tor_mutex_new(); not both. */

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ _crypto_new_pk_env_evp_pkey(EVP_PKEY *pkey)
		return _crypto_new_pk_env_rsa(rsa);
		}

		/* DOCDOC _crypto_pk_env_get_rsa */
		/** Helper, used by tor-checkkey.c. Return the RSA from a crypto_pk_env_t. */
		RSA *
		_crypto_pk_env_get_rsa(crypto_pk_env_t *env)
		{

+4 −3

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ static tor_mutex_t *log_mutex = NULL;
		/** Linked list of logfile_t. */
		static logfile_t *logfiles = NULL;
		#ifdef HAVE_SYSLOG_H
		/* DOCDOC syslog_count */
		/** The number of open syslog log handlers that we have. When this reaches 0,
		* we can close our connection to the syslog facility. */
		static int syslog_count = 0;
		#endif

		@@ -118,8 +119,8 @@ static int syslog_count = 0;
		#define UNLOCK_LOGS() STMT_NIL
		#endif

		/* What's the lowest log level anybody cares about? */
		/* DOCDOC _log_global_min_severity */
		/** What's the lowest log level anybody cares about? Checking this lets us
		* bail out early from log_debug if we aren't debugging. */
		int _log_global_min_severity = LOG_NOTICE;

		static void delete_log(logfile_t *victim);

+5 −3

Original line number	Diff line number	Diff line
		@@ -61,10 +61,12 @@ struct memarea_t {
		memarea_chunk_t first; /< Top of the chunk stack: never NULL. /
		};

		/** How many chunks will we put into the freelist before freeing them? */
		#define MAX_FREELIST_LEN 4
		/* DOCDOC freelist_len */
		int freelist_len=0;
		/* DOCDOC freelist */
		/** The number of memarea chunks currently in our freelist. */
		static int freelist_len=0;
		/** A linked list of unused memory area chunks. Used to prevent us from
		* spinning in malloc/free loops. */
		static memarea_chunk_t *freelist = NULL;

		/** Helper: allocate a new memarea chunk of around <b>chunk_size</b> bytes. */

+0 −3