wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup mttest.c : more output changes

Browse source 
More fprintf()s and printf()s to turn into BIO calls.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2015-06-21 19:19:17 +02:00
parent 9007dfa203
commit 8ca211707a
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
crypto/threads/mttest.c
View file

@ -530,9 +530,9 @@ int doit(char *ctx[4])
} else { } else {
done |= C_DONE; done |= C_DONE;
#ifdef undef #ifdef undef
fprintf(stdout, "CLIENT:from server:"); BIO_printf(bio_stdout, "CLIENT:from server:");
fwrite(cbuf, 1, i, stdout); BIO_write(bio_stdout, cbuf, i);
fflush(stdout); BIO_flush(bio_stdout);
#endif #endif
} }
} }
@ -561,9 +561,9 @@ int doit(char *ctx[4])
s_write = 1; s_write = 1;
s_w = 1; s_w = 1;
#ifdef undef #ifdef undef
fprintf(stdout, "SERVER:from client:"); BIO_printf(bio_stdout, "SERVER:from client:");
fwrite(sbuf, 1, i, stdout); BIO_write(bio_stdout, sbuf, i);
fflush(stdout); BIO_flush(bio_stdout);
#endif #endif
} }
} else { } else {
@ -603,7 +603,7 @@ int doit(char *ctx[4])
SSL_set_shutdown(s_ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); SSL_set_shutdown(s_ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
#ifdef undef #ifdef undef
fprintf(stdout, "DONE\n"); BIO_printf(bio_stdout, "DONE\n");
#endif #endif
err: err:
/* /*
@ -792,17 +792,17 @@ void thread_cleanup(void)
void solaris_locking_callback(int mode, int type, const char *file, int line) void solaris_locking_callback(int mode, int type, const char *file, int line)
{ {
# ifdef undef # ifdef undef
fprintf(stderr, "thread=%4d mode=%s lock=%s %s:%d\n", BIO_printf(bio_err, "thread=%4d mode=%s lock=%s %s:%d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
(mode & CRYPTO_LOCK) ? "l" : "u", (mode & CRYPTO_LOCK) ? "l" : "u",
(type & CRYPTO_READ) ? "r" : "w", file, line); (type & CRYPTO_READ) ? "r" : "w", file, line);
# endif # endif
/*- /*-
if (CRYPTO_LOCK_SSL_CERT == type) if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n", BIO_printf(bio_err,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
mode,file,line); mode,file,line);
*/ */
if (mode & CRYPTO_LOCK) { if (mode & CRYPTO_LOCK) {
/*- /*-
@ -972,16 +972,16 @@ void thread_cleanup(void)
void pthreads_locking_callback(int mode, int type, const char *file, int line) void pthreads_locking_callback(int mode, int type, const char *file, int line)
{ {
# ifdef undef # ifdef undef
fprintf(stderr, "thread=%4d mode=%s lock=%s %s:%d\n", BIO_printf(bio_err, "thread=%4d mode=%s lock=%s %s:%d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
(mode & CRYPTO_LOCK) ? "l" : "u", (mode & CRYPTO_LOCK) ? "l" : "u",
(type & CRYPTO_READ) ? "r" : "w", file, line); (type & CRYPTO_READ) ? "r" : "w", file, line);
# endif # endif
/*- /*-
if (CRYPTO_LOCK_SSL_CERT == type) if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n", BIO_printf(bio_err,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
mode,file,line); mode,file,line);
*/ */
if (mode & CRYPTO_LOCK) { if (mode & CRYPTO_LOCK) {
pthread_mutex_lock(&(lock_cs[type])); pthread_mutex_lock(&(lock_cs[type]));
@ -1129,24 +1129,24 @@ void thread_cleanup(void)
int i; int i;
CRYPTO_set_locking_callback(NULL); CRYPTO_set_locking_callback(NULL);
fprintf(stderr, "cleanup\n"); BIO_printf(bio_err, "cleanup\n");
for (i = 0; i < CRYPTO_num_locks(); i++) { for (i = 0; i < CRYPTO_num_locks(); i++) {
delete lock_cs[i]; delete lock_cs[i];
fprintf(stderr, "%8ld:%s\n", lock_count[i], CRYPTO_get_lock_name(i)); BIO_printf(bio_err, "%8ld:%s\n", lock_count[i], CRYPTO_get_lock_name(i));
} }
OPENSSL_free(lock_cs); OPENSSL_free(lock_cs);
OPENSSL_free(lock_count); OPENSSL_free(lock_count);
fprintf(stderr, "done cleanup\n"); BIO_printf(bio_err, "done cleanup\n");
} }
void beos_locking_callback(int mode, int type, const char *file, int line) void beos_locking_callback(int mode, int type, const char *file, int line)
{ {
# if 0 # if 0
fprintf(stderr, "thread=%4d mode=%s lock=%s %s:%d\n", BIO_printf(bio_err, "thread=%4d mode=%s lock=%s %s:%d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
(mode & CRYPTO_LOCK) ? "l" : "u", (mode & CRYPTO_LOCK) ? "l" : "u",
(type & CRYPTO_READ) ? "r" : "w", file, line); (type & CRYPTO_READ) ? "r" : "w", file, line);
# endif # endif
if (mode & CRYPTO_LOCK) { if (mode & CRYPTO_LOCK) {
lock_cs[type]->Lock(); lock_cs[type]->Lock();
@ -1172,14 +1172,14 @@ void do_threads(SSL_CTX *s_ctx, SSL_CTX *c_ctx)
resume_thread(thread_ctx[i]); resume_thread(thread_ctx[i]);
} }
printf("waiting...\n"); BIO_printf(bio_stdout, "waiting...\n");
for (i = 0; i < thread_number; i++) { for (i = 0; i < thread_number; i++) {
status_t result; status_t result;
wait_for_thread(thread_ctx[i], &result); wait_for_thread(thread_ctx[i], &result);
} }
printf("beos threads done (%d,%d)\n", BIO_printf(bio_stdout, "beos threads done (%d,%d)\n",
s_ctx->references, c_ctx->references); s_ctx->references, c_ctx->references);
} }
unsigned long beos_thread_id(void) unsigned long beos_thread_id(void)