diff options
| author | Simon Rettberg | 2013-08-13 17:15:18 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-08-13 17:15:18 +0200 |
| commit | 4b0eb8d51b0751dd74e655eb97f1078b2434f9bb (patch) | |
| tree | 4f76b3c01e94d4358d062c98b5d009308f11fbd2 | |
| parent | Test your coke, dork! (diff) | |
| download | dnbd3-4b0eb8d51b0751dd74e655eb97f1078b2434f9bb.tar.gz dnbd3-4b0eb8d51b0751dd74e655eb97f1078b2434f9bb.tar.xz dnbd3-4b0eb8d51b0751dd74e655eb97f1078b2434f9bb.zip | |
[SERVER] Name uplink thread, remove most integrity check debug messages
| -rw-r--r-- | src/server/integrity.c | 3 | ||||
| -rw-r--r-- | src/server/uplink.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/server/integrity.c b/src/server/integrity.c index a6d4ee5..82d493e 100644 --- a/src/server/integrity.c +++ b/src/server/integrity.c @@ -71,7 +71,6 @@ void integrity_shutdown() */ void integrity_check(dnbd3_image_t *image, int block) { - printf( "Queueing %d of %s\n", block, image->lower_name ); int i, freeSlot = -1; pthread_mutex_lock( &integrityQueueLock ); for (i = 0; i < queueLen; ++i) { @@ -90,7 +89,6 @@ void integrity_check(dnbd3_image_t *image, int block) } freeSlot = queueLen++; } - printf( "In slot %d\n", freeSlot ); checkQueue[freeSlot].image = image; checkQueue[freeSlot].block = block; pthread_cond_signal( &queueSignal ); @@ -144,7 +142,6 @@ static void* integrity_main(void *data) } if ( queueLen == 0 ) { pthread_cond_wait( &queueSignal, &integrityQueueLock ); - printf( "Queue woke up. %d jobs pending...\n", queueLen ); } } pthread_mutex_unlock( &integrityQueueLock ); diff --git a/src/server/uplink.c b/src/server/uplink.c index a4fccf9..6343ec3 100644 --- a/src/server/uplink.c +++ b/src/server/uplink.c @@ -169,7 +169,7 @@ static void* uplink_mainloop(void *data) // assert( link != NULL ); assert( link->queueLen == 0 ); - setThreadName( "uplink" ); + setThreadName( "idle-uplink" ); // fdEpoll = epoll_create( 2 ); if ( fdEpoll == -1 ) { @@ -262,8 +262,10 @@ static void* uplink_mainloop(void *data) link->betterFd = -1; link->currentServer = link->betterServer; link->image->working = TRUE; - if ( host_to_string( &link->currentServer, buffer, sizeof buffer ) ) { - printf( "[DEBUG] Now connected to %s\n", buffer ); + buffer[0] = '@'; + if ( host_to_string( &link->currentServer, buffer + 1, sizeof(buffer) - 1 ) ) { + printf( "[DEBUG] Now connected to %s\n", buffer + 1 ); + setThreadName( buffer ); } memset( &ev, 0, sizeof(ev) ); ev.events = EPOLLIN; |