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

Fixed mirroring to work (error reporting suspect though).

Browse Source
This commit is contained in:
Matthew Bloch
2012-05-22 00:22:06 +01:00
parent 7eaf5c3fd3
commit 811e4ab2cd
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
serve.c
View File

@@ -327,10 +327,16 @@ void* mirror_runner(void* serve_params_uncast)
for (pass=0; pass < 7 /* biblical */; pass++) { for (pass=0; pass < 7 /* biblical */; pass++) {
uint64_t current = 0; uint64_t current = 0;
debug("mirror start pass=%d", pass);
while (current < serve->size) { while (current < serve->size) {
int run = bitset_run_count(map, current, longest_run); int run = bitset_run_count(map, current, longest_run);
debug("mirror current=%d, run=%d", current, run);
if (bitset_is_set_at(map, current)) { if (bitset_is_set_at(map, current)) {
debug("^^^ writing", current, run);
/* dirty area */ /* dirty area */
socket_nbd_write( socket_nbd_write(
serve->mirror->client, serve->mirror->client,
@@ -351,7 +357,7 @@ void* mirror_runner(void* serve_params_uncast)
void control_mirror(struct control_params* client) void control_mirror(struct control_params* client)
{ {
off64_t size; off64_t size, remote_size;
int fd, map_fd; int fd, map_fd;
struct mirror_status *mirror; struct mirror_status *mirror;
union mysockaddr connect_to; union mysockaddr connect_to;
@@ -377,6 +383,8 @@ void control_mirror(struct control_params* client)
fd = socket_connect(&connect_to.generic); /* FIXME uses wrong error handler */ fd = socket_connect(&connect_to.generic); /* FIXME uses wrong error handler */
remote_size = socket_nbd_read_hello(fd);
mirror = xmalloc(sizeof(struct mirror_status)); mirror = xmalloc(sizeof(struct mirror_status));
mirror->client = fd; mirror->client = fd;
mirror->max_bytes_per_second = 0; mirror->max_bytes_per_second = 0;