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

Merged in pull request #3

parents 15f25101 73962c9e

Makefile

+64 −25
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ LDFLAGS += -lm -l crypto -l ssl -l pthread 


PROJECT = kinetic-c-client



PREFIX ?= /usr/local

LIBDIR ?= /lib



LIB_DIR = ./src/lib

VENDOR = ./vendor

PROTOBUFC = $(VENDOR)/protobuf-c
@@ -32,23 +35,51 @@ VERSION = ${shell head -n1 $(VERSION_FILE)} 
KINETIC_LIB_NAME = $(PROJECT).$(VERSION)

KINETIC_LIB = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).a

LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(VENDOR)

LIB_DEPS = $(PUB_INC)/kinetic_client.h $(PUB_INC)/byte_array.h $(PUB_INC)/kinetic_types.h $(LIB_DIR)/kinetic_connection.h $(LIB_DIR)/kinetic_hmac.h $(LIB_DIR)/kinetic_logger.h $(LIB_DIR)/kinetic_message.h $(LIB_DIR)/kinetic_nbo.h $(LIB_DIR)/kinetic_operation.h $(LIB_DIR)/kinetic_pdu.h $(LIB_DIR)/kinetic_proto.h $(LIB_DIR)/kinetic_socket.h $(LIB_DIR)/kinetic_types_internal.h

LIB_DEPS = \

	$(PROTOBUFC)/protobuf-c/protobuf-c.h \

	$(ZLOG)/zlog.h \

	$(ZLOG)/zlog-config.h \

	$(SOCKET99)/socket99.h \

	$(LIB_DIR)/kinetic_allocator.h \

	$(LIB_DIR)/kinetic_nbo.h \

	$(LIB_DIR)/kinetic_operation.h \

	$(LIB_DIR)/kinetic_pdu.h \

	$(LIB_DIR)/kinetic_proto.h \

	$(LIB_DIR)/kinetic_socket.h \

	$(LIB_DIR)/kinetic_message.h \

	$(LIB_DIR)/kinetic_logger.h \

	$(LIB_DIR)/kinetic_hmac.h \

	$(LIB_DIR)/kinetic_connection.h \

	$(LIB_DIR)/kinetic_types_internal.h \

	$(PUB_INC)/kinetic_types.h \

	$(PUB_INC)/byte_array.h \

	$(PUB_INC)/kinetic_client.h



# LIB_OBJ = $(patsubst %,$(OUT_DIR)/%,$(LIB_OBJS))

LIB_OBJS = $(OUT_DIR)/kinetic_allocator.o $(OUT_DIR)/kinetic_nbo.o $(OUT_DIR)/kinetic_operation.o $(OUT_DIR)/kinetic_pdu.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_socket.o $(OUT_DIR)/kinetic_message.o $(OUT_DIR)/kinetic_logger.o $(OUT_DIR)/kinetic_hmac.o $(OUT_DIR)/kinetic_connection.o $(OUT_DIR)/kinetic_types.o $(OUT_DIR)/kinetic_types_internal.o $(OUT_DIR)/byte_array.o $(OUT_DIR)/kinetic_client.o $(OUT_DIR)/socket99.o $(OUT_DIR)/protobuf-c.o $(OUT_DIR)/zlog.o

LIB_OBJS = \

	$(OUT_DIR)/socket99.o \

	$(OUT_DIR)/protobuf-c.o \

	$(OUT_DIR)/zlog.o \

	$(OUT_DIR)/kinetic_allocator.o \

	$(OUT_DIR)/kinetic_nbo.o \

	$(OUT_DIR)/kinetic_operation.o \

	$(OUT_DIR)/kinetic_pdu.o \

	$(OUT_DIR)/kinetic_proto.o \

	$(OUT_DIR)/kinetic_socket.o \

	$(OUT_DIR)/kinetic_message.o \

	$(OUT_DIR)/kinetic_logger.o \

	$(OUT_DIR)/kinetic_hmac.o \

	$(OUT_DIR)/kinetic_connection.o \

	$(OUT_DIR)/kinetic_types_internal.o \

	$(OUT_DIR)/kinetic_types.o \

	$(OUT_DIR)/byte_array.o \

	$(OUT_DIR)/kinetic_client.o

KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)



default: $(KINETIC_LIB)



all: clean test default run



ci: uninstall all install

	@echo

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) build completed successfully!

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) v$(VERSION) is in working order

	@echo



clean:

	bundle exec rake clobber

	rm -rf $(BIN_DIR)/* $(OUT_DIR)/*.o *.core
@@ -58,12 +89,18 @@ clean: 


# $(OUT_DIR)/%.o: %.c $(DEPS)

# 	$(CC) -c -o $@ $< $(CFLAGS)

$(OUT_DIR)/socket99.o: $(SOCKET99)/socket99.c $(SOCKET99)/socket99.h

	$(CC) -c -o $@ $< $(CFLAGS) -I$(SOCKET99)

$(OUT_DIR)/protobuf-c.o: $(PROTOBUFC)/protobuf-c/protobuf-c.c $(PROTOBUFC)/protobuf-c/protobuf-c.h

	$(CC) -c -o $@ $< -std=c99 -fPIC -g -Wall $(OPTIMIZE) -Wno-unused-parameter -I$(PROTOBUFC)

$(OUT_DIR)/zlog.o: $(ZLOG)/zlog.c $(ZLOG)/zlog.h $(ZLOG)/zlog-config.h

	$(CC) -c -o $@ $< $(CFLAGS) -I$(ZLOG)

$(OUT_DIR)/kinetic_allocator.o: $(LIB_DIR)/kinetic_allocator.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_types_internal.o: $(LIB_DIR)/kinetic_types_internal.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_nbo.o: $(LIB_DIR)/kinetic_nbo.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_operation.o: $(LIB_DIR)/kinetic_operation.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_pdu.o: $(LIB_DIR)/kinetic_pdu.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_proto.o: $(LIB_DIR)/kinetic_proto.c $(LIB_DEPS)
@@ -78,22 +115,25 @@ $(OUT_DIR)/kinetic_hmac.o: $(LIB_DIR)/kinetic_hmac.c $(LIB_DEPS) 
	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_connection.o: $(LIB_DIR)/kinetic_connection.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_operation.o: $(LIB_DIR)/kinetic_operation.c $(LIB_DEPS)

$(OUT_DIR)/kinetic_types_internal.o: $(LIB_DIR)/kinetic_types_internal.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/kinetic_types.o: $(LIB_DIR)/kinetic_types.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/byte_array.o: $(LIB_DIR)/byte_array.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)

$(OUT_DIR)/zlog.o: $(ZLOG)/zlog.c $(ZLOG)/zlog.h $(ZLOG)/zlog-config.h

	$(CC) -c -o $@ $< $(CFLAGS) -I$(ZLOG)

$(OUT_DIR)/socket99.o: $(SOCKET99)/socket99.c $(SOCKET99)/socket99.h

	$(CC) -c -o $@ $< $(CFLAGS) -I$(SOCKET99)

$(OUT_DIR)/protobuf-c.o: $(PROTOBUFC)/protobuf-c/protobuf-c.c $(PROTOBUFC)/protobuf-c/protobuf-c.h

	$(CC) -c -o $@ $< -std=c99 -fPIC -g -Wall $(OPTIMIZE) -Wno-unused-parameter -I$(PROTOBUFC)

$(OUT_DIR)/kinetic_client.o: $(LIB_DIR)/kinetic_client.c $(LIB_DEPS)

	$(CC) -c -o $@ $< $(CFLAGS) $(LIB_INCS)





ci: uninstall all install

	@echo

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) build completed successfully!

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) v$(VERSION) is in working order

	@echo





#-------------------------------------------------------------------------------

# Test Support

#-------------------------------------------------------------------------------
@@ -114,7 +154,6 @@ JAVA_BIN = $(JAVA_HOME)/bin/java 
# Static and Dynamic Library Build Support

#-------------------------------------------------------------------------------



PREFIX ?= /usr/local

KINETIC_SO_DEV = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).so

KINETIC_SO_RELEASE = $(PREFIX)/lib$(KINETIC_LIB_NAME).so
@@ -149,8 +188,8 @@ install: $(KINETIC_LIB) $(KINETIC_SO_DEV) 
	@echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)

	@echo --------------------------------------------------------------------------------

	@echo

	$(INSTALL) -d $(PREFIX)/lib/

	$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)/lib/

	$(INSTALL) -d $(PREFIX)${LIBDIR}

	$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)${LIBDIR}/

	$(INSTALL) -d $(PREFIX)/include/

	$(INSTALL) -c $(PUB_INC)/$(API_NAME).h $(PREFIX)/include/

	$(INSTALL) -c $(PUB_INC)/kinetic_types.h $(PREFIX)/include/
@@ -161,9 +200,9 @@ uninstall: 
	@echo Uninstalling $(PROJECT) from $(PREFIX)

	@echo --------------------------------------------------------------------------------

	@echo

	$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.a

	$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.so

	$(RM) -f $(PREFIX)/include/${PUBLIC_API}.h

	$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.a

	$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.so

	$(RM) -f $(PREFIX)/include/${API_NAME}.h

	$(RM) -f $(PREFIX)/include/kinetic_types.h

	$(RM) -f $(PREFIX)/include/kinetic_proto.h

	$(RM) -f $(PREFIX)/include/protobuf-c/protobuf-c.h

src/lib/kinetic_allocator.c

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void KineticAllocator_InitList(KineticList* const list) 
    };

}



void* KineticAllocator_NewItem(KineticList* const list, size_t size)

static void* KineticAllocator_NewItem(KineticList* const list, size_t size)

{

    KineticListItem* newItem = (KineticListItem*)malloc(sizeof(KineticListItem));

    if (newItem == NULL) {
@@ -82,7 +82,7 @@ void* KineticAllocator_NewItem(KineticList* const list, size_t size) 
    return newItem->data;

}



void KineticAllocator_FreeItem(KineticList* const list, void* item)

static void KineticAllocator_FreeItem(KineticList* const list, void* item)

{

    KineticAllocator_LockList(list);

    KineticListItem* cur = list->start;
@@ -149,7 +149,7 @@ void KineticAllocator_FreeItem(KineticList* const list, void* item) 
    KineticAllocator_UnlockList(list);

}



void KineticAllocator_FreeList(KineticList* const list)

static void KineticAllocator_FreeList(KineticList* const list)

{

    if (list != NULL) {

        #ifdef KINETIC_LOG_ALLOCATOR

src/lib/kinetic_client.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ KineticStatus KineticClient_Connect(const KineticSession* config, 


    // Obtain a new connection/handle

    *handle = KineticConnection_NewConnection(config);

    if (handle == KINETIC_HANDLE_INVALID) {

    if (*handle == KINETIC_HANDLE_INVALID) {

        LOG("Failed connecting to device!");

        return KINETIC_STATUS_SESSION_INVALID;

    }

src/lib/kinetic_logger.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ const char* _str_false = "false"; 
    _indent[strlen(_indent) - 2] = '\0'; \

    LOGF("%s}", _indent);



int KineticLogger_u8toa(char* p_buf, uint8_t val)

static int KineticLogger_u8toa(char* p_buf, uint8_t val)

{

    // LOGF("Converting byte=%02u", val);

    const int width = 2;
@@ -140,7 +140,7 @@ int KineticLogger_u8toa(char* p_buf, uint8_t val) 
    return width;

}



int KineticLogger_ByteArraySliceToCString(char* p_buf,

static int KineticLogger_ByteArraySliceToCString(char* p_buf,

        const ByteArray bytes, const int start, const int count)

{

    int len = 0;