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

Merge pull request #3 from Seagate/features/osx-build-fixes 

Features/osx build fixes
parents da357d8e d9fee5a3

src/read_file_blocking.cc

+6 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <stdio.h>

#include <sys/fcntl.h>

#include <sys/mman.h>

#include <inttypes.h>



#include "protobufutil/message_stream.h"
@@ -58,8 +59,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 +77,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 (int64_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-%10" PRId64, kinetic_key, i);

        std::string key(key_buffer);



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

    printf("\n");



    if(!close(file)) {

    if(close(file)) {

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

        return 1;

    }

src/read_file_nonblocking.cc

+2 −2
Original line number Diff line number Diff line
@@ -119,13 +119,13 @@ int main(int argc, char* argv[]) { 
    int remaining = 0;

    fd_set read_fds, write_fds;

    int num_fds = 0;

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

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

        unsigned int block_length = 1024*1024;

        if (i + block_length > file_size) {

            block_length = file_size - i + 1;

        }



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

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

        remaining++;

        TestCallback* callback = new TestCallback(output_buffer + i, block_length, &remaining);

        std::string key(key_buffer);

src/write_file_blocking.cc

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <stdio.h>

#include <sys/fcntl.h>

#include <sys/mman.h>

#include <inttypes.h>



#include "protobufutil/message_stream.h"
@@ -56,13 +57,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 (int64_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-%10" PRId64, kinetic_key, i);



        std::string key(key_buffer);

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

src/write_file_nonblocking.cc

+2 −2
Original line number Diff line number Diff line
@@ -80,13 +80,13 @@ int main(int argc, char* argv[]) { 
    int remaining = 0;

    fd_set read_fds, write_fds;

    int num_fds = 0;

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

    for (int64_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-%10" PRId64, kinetic_key, (int64_t)i);

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



        std::string key(key_buffer);

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