diff options
| author | Manuel Bentele | 2020-10-16 17:15:49 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2020-10-16 17:15:49 +0200 |
| commit | 969496f15e1e0359e26c2c6e995ad4ef82720f86 (patch) | |
| tree | 358466216630eb10e8ee91b9ede490424f6db848 /src/server/uplink.c | |
| parent | [FUSE] turn on compiler optimization to fix warning (diff) | |
| download | dnbd3-969496f15e1e0359e26c2c6e995ad4ef82720f86.tar.gz dnbd3-969496f15e1e0359e26c2c6e995ad4ef82720f86.tar.xz dnbd3-969496f15e1e0359e26c2c6e995ad4ef82720f86.zip | |
[BUILD] rewrite CMake build system to track changes of source files
This change restructures the source code directories, separates shared
form non-shared application code and adds CMake dependencies. These
dependencies allow the tracking of changes and trigger a rebuild of
those build targets where changed files are involved.
WARNING: Note that the support of the DNBD3_SERVER_AFL build option is
not supported yet. Thus, the option should be never turned on.
Diffstat (limited to 'src/server/uplink.c')
| -rw-r--r-- | src/server/uplink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/uplink.c b/src/server/uplink.c index cb4f956..1fded60 100644 --- a/src/server/uplink.c +++ b/src/server/uplink.c @@ -4,10 +4,10 @@ #include "image.h" #include "altservers.h" #include "net.h" -#include "../shared/sockhelper.h" -#include "../shared/protocol.h" -#include "../shared/timing.h" -#include "../shared/crc32.h" +#include <dnbd3/shared/sockhelper.h> +#include <dnbd3/shared/protocol.h> +#include <dnbd3/shared/timing.h> +#include <dnbd3/shared/crc32.h> #include "threadpool.h" #include "reference.h" @@ -358,7 +358,7 @@ static bool uplink_requestInternal(dnbd3_uplink_t *uplink, void *data, uplink_ca request->handle = ++uplink->queueId; request->from = start & ~(uint64_t)(DNBD3_BLOCK_SIZE - 1); request->to = (end + DNBD3_BLOCK_SIZE - 1) & ~(uint64_t)(DNBD3_BLOCK_SIZE - 1); -#ifdef _DEBUG +#ifdef DEBUG timing_get( &request->entered ); #endif request->hopCount = hops; @@ -650,7 +650,7 @@ static void* uplink_mainloop(void *data) } timing_set( &nextAltCheck, &now, (discoverFailCount < SERVER_RTT_MAX_UNREACH) ? altCheckInterval : SERVER_RTT_INTERVAL_FAILED ); } -#ifdef _DEBUG +#ifdef DEBUG if ( uplink->current.fd != -1 && !uplink->shutdown ) { bool resend = false; ticks deadline; @@ -662,7 +662,7 @@ static void* uplink_mainloop(void *data) " (from %" PRIu64 " to %" PRIu64 ", sent: %d) %s:%d", it->from, it->to, (int)it->sent, PIMG(uplink->image) ); it->entered = now; -#ifdef _DEBUG_RESEND_STARVING +#ifdef DEBUG_RESEND_STARVING it->sent = false; resend = true; #endif |