From: bert hubert <bert.hubert@powerdns.com>
Date: Tue, 2 Feb 2016 15:34:03 +0000 (+0100)
Subject: remove debugging output - it served its purpose, likely fix the random hang bug in... 
X-Git-Tag: dnsdist-1.0.0-alpha2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=305c6abe32e2f25f5ad86915b1f987514fd33090;p=pdns

remove debugging output - it served its purpose, likely fix the random hang bug in openssl. It was not openssl's fault.
---

diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc
index a9d5e8eae..5b4327fbb 100644
--- a/pdns/opensslsigners.cc
+++ b/pdns/opensslsigners.cc
@@ -16,14 +16,9 @@ extern "C" {
 void openssl_pthreads_locking_callback(int mode, int type, const char *file, int line)
 {
   if (mode & CRYPTO_LOCK) {
-    if(type != 19 && type !=18)
-    cout<<"Lock of "<<type<<" from "<<file<<" " <<line<<": r/w -> " << ((type&CRYPTO_READ)?"r":"w")<<endl;
-
     pthread_mutex_lock(&(openssllocks[type]));
 
   }else {
-    if(type != 19 && type !=18)
-    cout<<"Unlock of "<<type<<" from "<<file<<" " <<line<<" -> "<<((type&CRYPTO_READ)?"r":"w")<<endl;
     pthread_mutex_unlock(&(openssllocks[type]));
   }
 }
@@ -36,11 +31,10 @@ unsigned long openssl_pthreads_id_callback()
 
 void openssl_thread_setup()
 {
-  cout<<"Thread setup!"<<endl;
   openssllocks = (pthread_mutex_t*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
 
   for (int i = 0; i < CRYPTO_num_locks(); i++)
-    pthread_mutex_init(&(openssllocks[i++]), NULL);
+    pthread_mutex_init(&(openssllocks[i]), NULL);
 
   CRYPTO_set_id_callback(openssl_pthreads_id_callback);
   CRYPTO_set_locking_callback(openssl_pthreads_locking_callback);