Commit c5c8f7fd authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'develop' of github.com:Seagate/kinetic-c into develop

parents 6f30fbe0 82adb4c0

include/kinetic_types.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ typedef enum { 
    KINETIC_STATUS_INVALID_REQUEST,     // Something about the request is invalid

    KINETIC_STATUS_OPERATION_INVALID,   // Operation was invalid

    KINETIC_STATUS_OPERATION_FAILED,    // Device reported an operation error

    KINETIC_STATUS_OPERATION_TIMEDOUT,  // Device did not respond to the operation in time

    KINETIC_STATUS_CLUSTER_MISMATCH,    // Specified cluster version does not match device

    KINETIC_STATUS_VERSION_MISMATCH,    // The specified object version info for a PUT/GET do not match stored object

    KINETIC_STATUS_DATA_ERROR,          // Device reported data error, no space or HMAC failure

kinetic-c.sublime-project

+122 −85
Original line number Diff line number Diff line 
{

  "folders":

  [

    {

      "follow_symlinks": true,

      "path": ".",

      "binary_file_patterns": ["build"]

    }

  ],

  "settings":

  {

    "binary_file_patterns":

    [

      "*.jpg",

      "*.jpeg",

      "*.png",

      "*.gif",

      "*.ttf",

      "*.tga",

      "*.dds",

      "*.ico",

      "*.eot",

      "*.pdf",

      "*.swf",

      "*.jar",

      "*.zip"

    ],

    "ensure_newline_at_eof_on_save": true,

    "file_exclude_patterns":

    [

      "*.pyc",

      "*.pyo",

      "*.exe",

      "*.dll",

      "*.obj",

      "*.o",

      "*.a",

      "*.lib",

      "*.so",

      "*.dylib",

      "*.ncb",

      "*.sdf",

      "*.suo",

      "*.pdb",

      "*.idb",

      ".DS_Store",

      "*.class",

      "*.psd",

      "*.d",

      "*.db",

      "*.dirstamp",

      "*.sublime-workspace"

    ],

    "folder_exclude_patterns":

    [

      ".svn",

      ".git",

      ".hg",

      "CVS",

      "cache",

      "out"

    ],

    "index_exclude_patterns":

    [

      "*.log",

      ".svn",

      ".git",

      ".hg",

      "CVS",

      "cache",

      "out",

      "build"

    ],

    "index_files": true,

    // "rulers":

    // [

    //  80,

    //  100

    // ],

    "tab_size": 4,

    "translate_tabs_to_spaces": true,

    "trim_automatic_white_space": true,

    "word_wrap": "true",

    "wrap_width": 0,

    "sublimeclang_dont_prepend_clang_includes": true,

    "sublimeclang_options":

    [

      "-Wcast-align",

      "-g",

      "-DGNU_COMPILER",

      "-std=c99",

      "-g",

      "-Wall",

      "-Wextra",

      "-pedantic",

      "-Wstrict-prototypes",

      "-Werror=strict-prototypes",

      "-Werror=implicit-function-declaration",

      "-D_POSIX_C_SOURCE=199309L",

      "-D_C99_SOURCE=1",

      "-Wno-nonnull",

      "-Wno-address",

      "-Wno-missing-field-initializers",

      "-O",

      "-xc",

      "-isystem", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/",

      // "-isystem", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1",

      // "-isystem", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1/tr1",

      "-isystem", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers",



      "-I${folder:${project_path:kinetic-c.sublime-project}}/src/**",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/include",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/test/**",

      // "-I${folder:${project_path:kinetic-c.sublime-project}}/vendor/**",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/vendor/protobuf-c",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/vendor/socket99",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/vendor/bundle/ruby/2.0.0/bundler/gems/ceedling-0.15.6/vendor/unity/src",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/build/test/mocks",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/test/support/stubs",

      "-I${folder:${project_path:kinetic-c.sublime-project}}/test/support"

    ]

  },

	"build_systems":

	[

		{
@@ -94,89 +215,5 @@ 
			"name": "Full CI build",

			"working_dir": "${project_path}"

		}

	],

	"folders":

	[

		{

			"follow_symlinks": true,

			"path": ".",

			"binary_file_patterns": ["build"]

		},

	],

	"settings":

	{

		"binary_file_patterns":

		[

			"*.jpg",

			"*.jpeg",

			"*.png",

			"*.gif",

			"*.ttf",

			"*.tga",

			"*.dds",

			"*.ico",

			"*.eot",

			"*.pdf",

			"*.swf",

			"*.jar",

			"*.zip"

		],

		"ensure_newline_at_eof_on_save": true,

		"file_exclude_patterns":

		[

			"*.pyc",

			"*.pyo",

			"*.exe",

			"*.dll",

			"*.obj",

			"*.o",

			"*.a",

			"*.lib",

			"*.so",

			"*.dylib",

			"*.ncb",

			"*.sdf",

			"*.suo",

			"*.pdb",

			"*.idb",

			".DS_Store",

			"*.class",

			"*.psd",

			"*.d",

			"*.db",

			"*.dirstamp",

			"*.sublime-workspace"

		],

		"folder_exclude_patterns":

		[

			".svn",

			".git",

			".hg",

			"CVS",

			"cache",

			"out"

		],

		"index_exclude_patterns":

		[

			"*.log",

			".svn",

			".git",

			".hg",

			"CVS",

			"cache",

			"out",

			"build"

		],

		"index_files": true,

		// "rulers":

		// [

		// 	80,

		// 	100

		// ],

		"tab_size": 4,

		"translate_tabs_to_spaces": true,

		"trim_automatic_white_space": true,

		"word_wrap": "true",

		"wrap_width": 0

	}

	]

}

src/lib/kinetic_allocator.c

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ void KineticAllocator_FreeOperation(KineticConnection* const connection, Kinetic 
            operation->response, operation, connection);

        KineticAllocator_FreePDU(connection, operation->response);

    }

    pthread_mutex_destroy(&operation->timeoutTimeMutex);

    KineticAllocator_FreeItem(&connection->operations, (void*)operation);

    LOGF3("Freed operation (0x%0llX) on connection (0x%0llX)", operation, connection);

}

src/lib/kinetic_client.c

+0 −4
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ KineticStatus KineticClient_Get(KineticSessionHandle handle, 


    // Initialize request

    KineticOperation_BuildGet(operation, entry);

    if (closure != NULL) {operation->closure = *closure;}



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);
@@ -169,7 +168,6 @@ KineticStatus KineticClient_Delete(KineticSessionHandle handle, 


    // Initialize request

    KineticOperation_BuildDelete(operation, entry);

    if (closure != NULL) {operation->closure = *closure;}



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);
@@ -191,7 +189,6 @@ KineticStatus KineticClient_GetKeyRange(KineticSessionHandle handle, 


    // Initialize request

    KineticOperation_BuildGetKeyRange(operation, range, keys);

    if (closure != NULL) {operation->closure = *closure;}



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);
@@ -210,7 +207,6 @@ KineticStatus KineticClient_GetLog(KineticSessionHandle handle, 


    // Initialize request

    KineticOperation_BuildGetLog(operation, type, info);

    if (closure != NULL) {operation->closure = *closure;}



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);

src/lib/kinetic_connection.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ void KineticConnection_FreeConnection(KineticSessionHandle* const handle) 
    assert(*handle != KINETIC_HANDLE_INVALID);

    KineticConnection* connection = KineticConnection_FromHandle(*handle);

    assert(connection != NULL);

    pthread_mutex_destroy(&connection->writeMutex);

    *connection = (KineticConnection) {

        .connected = false

    };