Commit 36675daa authored by Manuel Wudka-Robles's avatar Manuel Wudka-Robles
Browse files

OSX build fixes

parent da357d8e

src/read_file_blocking.cc

+5 −5
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ int main(int argc, char* argv[]) { 
        return 1;

    }



    int file_size = std::stoi(value);

    printf("Reading file of size %d\n", file_size);

    ssize_t file_size = std::stoll(value);

    printf("Reading file of size %zd\n", file_size);



    int file = open(output_file_name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);

    if(!file) {
@@ -76,14 +76,14 @@ int main(int argc, char* argv[]) { 
    }

    char* output_buffer = (char*)mmap(0, file_size, PROT_READ | PROT_WRITE, MAP_SHARED, file, 0);

    char key_buffer[100];

    for (int i = 0; i < file_size; i += 1024*1024) {

    for (off_t i = 0; i < file_size; i += 1024*1024) {

        int block_length = 1024*1024;

        if (i + block_length > file_size) {

            block_length = file_size - i;

        }



        std::string value;

        sprintf(key_buffer, "%s-%10d", kinetic_key, i);

        sprintf(key_buffer, "%s-%10llu", kinetic_key, i);

        std::string key(key_buffer);



        if(!kinetic_connection->Get(key, &value, NULL, NULL).ok()) {
@@ -96,7 +96,7 @@ int main(int argc, char* argv[]) { 
    }

    printf("\n");



    if(!close(file)) {

    if(close(file)) {

        printf("Unable to close file\n");

        return 1;

    }

src/write_file_blocking.cc

+2 −2
Original line number Diff line number Diff line
@@ -56,13 +56,13 @@ int main(int argc, char* argv[]) { 
    fstat(file, &inputfile_stat);

    char* inputfile_data = (char*)mmap(0, inputfile_stat.st_size, PROT_READ, MAP_SHARED, file, 0);

    char key_buffer[100];

    for (int i = 0; i < inputfile_stat.st_size; i += 1024*1024) {

    for (off_t i = 0; i < inputfile_stat.st_size; i += 1024*1024) {

        int value_size = 1024*1024;

        if (i + value_size > inputfile_stat.st_size) {

            value_size = inputfile_stat.st_size - i + 1;

        }



        sprintf(key_buffer, "%s-%10d", kinetic_key, i);

        sprintf(key_buffer, "%s-%10llu", kinetic_key, i);



        std::string key(key_buffer);

        std::string value(inputfile_data + i, value_size);