bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some debugging, got it to serve.

Browse Source
This commit is contained in:
Matthew Bloch
2012-05-15 03:16:19 +01:00
parent e2fbc7dcc1
commit 94c2d44d7d
1 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
flexnbd.c
View File

@@ -87,6 +87,14 @@ void error(int consult_errno, int close_socket, const char* format, ...)
exit(1); exit(1);
} }
#ifndef DEBUG
# define debug(msg, ...)
#else
# include <sys/times.h>
# define debug(msg, ...) fprintf(stderr, "% 4d % 4d: " msg "\n" , \
(int) pthread_self(), (int) times(NULL), ##__VA_ARGS__)
#endif
#define CLIENT_ERROR(msg, ...) \ #define CLIENT_ERROR(msg, ...) \
error(0, client->socket, msg, ##__VA_ARGS__) error(0, client->socket, msg, ##__VA_ARGS__)
#define CLIENT_ERROR_ON_FAILURE(test, msg, ...) \ #define CLIENT_ERROR_ON_FAILURE(test, msg, ...) \
@@ -150,8 +158,7 @@ int readloop(int filedes, void *buffer, size_t size)
size_t readden=0; size_t readden=0;
while (readden < size) { while (readden < size) {
size_t result = read(filedes, buffer+readden, size-readden); size_t result = read(filedes, buffer+readden, size-readden);
printf("read size=%d readden=%d result=%d\n", size, readden, result); if (result == 0 /* EOF */ || result == -1 /* error */)
if (result == -1)
return -1; return -1;
readden += result; readden += result;
} }
@@ -176,15 +183,22 @@ int client_serve_request(struct client_params* client)
struct nbd_request request; struct nbd_request request;
struct nbd_reply reply; struct nbd_reply reply;
CLIENT_ERROR_ON_FAILURE( if (readloop(client->socket, &request, sizeof(request)) == -1) {
readloop(client->socket, &request, sizeof(request)), if (errno == 0) {
"Failed to read request" debug("EOF reading request");
); return 1; /* neat point to close the socket */
}
else {
CLIENT_ERROR_ON_FAILURE(-1, "Error reading request");
}
}
reply.magic = htobe32(REPLY_MAGIC); reply.magic = htobe32(REPLY_MAGIC);
reply.error = htobe32(0); reply.error = htobe32(0);
memcpy(reply.handle, request.handle, 8); memcpy(reply.handle, request.handle, 8);
debug("request type %d", be32toh(request.type));
if (be32toh(request.magic) != REQUEST_MAGIC) if (be32toh(request.magic) != REQUEST_MAGIC)
CLIENT_ERROR("Bad magic %08x", be32toh(request.magic)); CLIENT_ERROR("Bad magic %08x", be32toh(request.magic));
@@ -194,13 +208,21 @@ int client_serve_request(struct client_params* client)
case REQUEST_WRITE: case REQUEST_WRITE:
/* check it's not out of range */ /* check it's not out of range */
if (be64toh(request.from) < 0 || if (be64toh(request.from) < 0 ||
be64toh(request.from)+be64toh(request.len) > client->size) { be64toh(request.from)+be32toh(request.len) > client->size) {
debug("request read %ld+%d out of range",
be64toh(request.from),
be32toh(request.len)
);
reply.error = htobe32(1); reply.error = htobe32(1);
write(client->socket, &reply, sizeof(reply)); write(client->socket, &reply, sizeof(reply));
return 0; return 0;
} }
break;
case REQUEST_DISCONNECT: case REQUEST_DISCONNECT:
debug("request disconnect");
return 1; return 1;
default: default:
CLIENT_ERROR("Unknown request %08x", be32toh(request.type)); CLIENT_ERROR("Unknown request %08x", be32toh(request.type));
} }
@@ -208,6 +230,7 @@ int client_serve_request(struct client_params* client)
switch (be32toh(request.type)) switch (be32toh(request.type))
{ {
case REQUEST_READ: case REQUEST_READ:
debug("request read %ld+%d", be64toh(request.from), be32toh(request.len));
write(client->socket, &reply, sizeof(reply)); write(client->socket, &reply, sizeof(reply));
offset = be64toh(request.from); offset = be64toh(request.from);
@@ -216,24 +239,25 @@ int client_serve_request(struct client_params* client)
client->socket, client->socket,
client->fileno, client->fileno,
&offset, &offset,
be64toh(request.len) be32toh(request.len)
), ),
"sendfile failed from=%ld, len=%ld", "sendfile failed from=%ld, len=%d",
offset, offset,
be64toh(request.len) be32toh(request.len)
); );
break; break;
case REQUEST_WRITE: case REQUEST_WRITE:
debug("request write %ld+%d", be64toh(request.from), be32toh(request.len));
CLIENT_ERROR_ON_FAILURE( CLIENT_ERROR_ON_FAILURE(
readloop( readloop(
client->socket, client->socket,
client->mapped + be64toh(request.from), client->mapped + be64toh(request.from),
be64toh(request.len) be32toh(request.len)
), ),
"read failed from=%ld, len=%d", "read failed from=%ld, len=%d",
be64toh(request.from), be64toh(request.from),
be64toh(request.len) be32toh(request.len)
); );
write(client->socket, &reply, sizeof(reply)); write(client->socket, &reply, sizeof(reply));
@@ -254,6 +278,7 @@ void client_open_file(struct client_params* client)
MAP_SHARED, client->fileno, 0); MAP_SHARED, client->fileno, 0);
CLIENT_ERROR_ON_FAILURE((long) client->mapped, "Couldn't map file %s", CLIENT_ERROR_ON_FAILURE((long) client->mapped, "Couldn't map file %s",
client->filename); client->filename);
debug("opened %s size %ld on fd %d @ %p", client->filename, client->size, client->fileno, client->mapped);
} }
void client_send_hello(struct client_params* client) void client_send_hello(struct client_params* client)
@@ -278,6 +303,7 @@ void* client_serve(void* client_uncast)
client_send_hello(client); client_send_hello(client);
while (client_serve_request(client) == 0) while (client_serve_request(client) == 0)
;
CLIENT_ERROR_ON_FAILURE( CLIENT_ERROR_ON_FAILURE(
close(client->socket), close(client->socket),