Skip to content

Commit

Permalink
Merge branch 'next' into OpenMAMA-6.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@fquinner
fquinner committed Sep 17, 2019
2 parents 0f41279 + 447524a commit 3aec8db
Show file tree
Hide file tree
Showing 17 changed files with 149 additions and 67 deletions.
4 changes: 4 additions & 0 deletions cmake/MSVC.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")

set (CMAKE_SHARED_LIBRARY_PREFIX "lib")
# On windows this file has historically been named libmamac for some reason. Will conform in future.
set (CMAKE_STATIC_LIBRARY_PREFIX "lib")
set (CMAKE_IMPORT_LIBRARY_PREFIX "lib")
set (CMAKE_SHARED_MODULE_PREFIX "lib")

if (CMAKE_BUILD_TYPE MATCHES DEBUG)
set (OPENMAMA_LIBRARY_SUFFIX "mdd")
set (OPENMAMA_MAMAJNI_TARGET_SUFFIX "d")
set (OPENMAMA_LIBRARY_STATIC_SUFFIX "mtd")
else ()
set (OPENMAMA_LIBRARY_SUFFIX "md")
set (OPENMAMA_LIBRARY_STATIC_SUFFIX "mt")
endif ()

set (OPENMAMA_MAMA_TARGET_SUFFIX "c")
Expand Down
13 changes: 11 additions & 2 deletions common/c_cpp/src/c/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,16 @@ set(sources
list(APPEND sources ${SYSTEM_SOURCES})

add_library(wombatcommon SHARED ${sources})
add_library(wombatcommonstatic STATIC ${sources})
if(WIN32)
target_link_libraries(wombatcommon ws2_32 advapi32 kernel32 Pdh shlwapi)
target_link_libraries(wombatcommonstatic ws2_32 advapi32 kernel32 Pdh shlwapi)
endif()

file(GLOB wombat_inst_includes wombat/*.h ${system}/wombat/*.h)
if(WIN32)
file(GLOB wombat_platform_inst_includes ${system}/*.h)
endif()
list(APPEND inst_includes
destroyHandle.h
list.h
Expand All @@ -54,14 +59,18 @@ list(APPEND inst_includes
timers.h)

set_target_properties(wombatcommon PROPERTIES OUTPUT_NAME "wombatcommon${OPENMAMA_LIBRARY_SUFFIX}")
install(TARGETS wombatcommon
set_target_properties(wombatcommonstatic PROPERTIES OUTPUT_NAME "wombatcommon${OPENMAMA_LIBRARY_STATIC_SUFFIX}")
install(TARGETS wombatcommon wombatcommonstatic
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)

install(FILES ${wombat_inst_includes}
DESTINATION include/wombat)

if(WIN32)
install(FILES ${wombat_platform_inst_includes}
DESTINATION include/${system})
endif()
install(FILES ${inst_includes}
DESTINATION include)

Expand Down
6 changes: 5 additions & 1 deletion common/c_cpp/src/cpp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ set(sources
add_library(wombatcommoncpp SHARED ${sources})
target_link_libraries(wombatcommoncpp wombatcommon)

add_library(wombatcommoncppstatic STATIC ${sources})
target_link_libraries(wombatcommoncppstatic wombatcommonstatic)

set_target_properties(wombatcommoncpp PROPERTIES OUTPUT_NAME "wombatcommoncpp${OPENMAMA_LIBRARY_SUFFIX}")
install(TARGETS wombatcommoncpp
set_target_properties(wombatcommoncppstatic PROPERTIES OUTPUT_NAME "wombatcommoncpp${OPENMAMA_LIBRARY_STATIC_SUFFIX}")
install(TARGETS wombatcommoncpp wombatcommoncppstatic
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
Expand Down
12 changes: 11 additions & 1 deletion mama/c_cpp/src/c/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,26 @@ set(sources
list(APPEND sources ${SYSTEM_SOURCES})

list(APPEND MAMA_LINK_LIBRARIES ${APR_LIBRARY} wombatcommon ${CMAKE_THREAD_LIBS_INIT})
list(APPEND MAMA_STATIC_LINK_LIBRARIES ${APR_LIBRARY} wombatcommonstatic ${CMAKE_THREAD_LIBS_INIT})
if(UNIX)
list(APPEND MAMA_LINK_LIBRARIES m)
list(APPEND MAMA_STATIC_LINK_LIBRARIES m)
else()
list(APPEND MAMA_LINK_LIBRARIES rpcrt4)
list(APPEND MAMA_STATIC_LINK_LIBRARIES rpcrt4)
endif()

add_library(mama SHARED ${sources})
target_link_libraries(mama ${MAMA_LINK_LIBRARIES})

add_library(mamastatic STATIC ${sources})
target_link_libraries(mamastatic ${MAMA_STATIC_LINK_LIBRARIES})

# On windows this file has historically been named libmamac for some reason. Will conform in future.
set_target_properties(mama PROPERTIES OUTPUT_NAME "mama${OPENMAMA_MAMA_TARGET_SUFFIX}${OPENMAMA_LIBRARY_SUFFIX}")
set_target_properties(mamastatic PROPERTIES OUTPUT_NAME "mama${OPENMAMA_MAMA_TARGET_SUFFIX}${OPENMAMA_LIBRARY_STATIC_SUFFIX}")

install(TARGETS mama
install(TARGETS mama mamastatic
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
Expand All @@ -146,5 +153,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mama/version.h" DESTINATION include/m
if (INSTALL_RUNTIME_DEPENDENCIES)
if (WIN32)
install (DIRECTORY ${APR_ROOT}/bin/ DESTINATION bin FILES_MATCHING PATTERN "*apr*.dll")
elseif(UNIX)
message(STATUS "Installing apr_root")
install (FILES ${APR_LIBRARY} DESTINATION lib)
endif()
endif()
2 changes: 1 addition & 1 deletion mama/c_cpp/src/c/msg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ mamaMsg_addMsg(
return impl->mPayloadBridge->msgPayloadAddMsg (impl->mPayload,
name,
fid,
subMsg->mPayload);
subMsg);


}
Expand Down
32 changes: 12 additions & 20 deletions mama/c_cpp/src/c/payload/qpidmsg/payload.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1617,11 +1617,10 @@ mama_status
qpidmsgPayload_addMsg (msgPayload msg,
const char* name,
mama_fid_t fid,
msgPayload value)
mamaMsg value)
{
qpidmsgPayloadImpl* impl = (qpidmsgPayloadImpl*) msg;
mama_status status = MAMA_STATUS_OK;
mamaMsg tmpMsg = NULL;

if (NULL == impl || NULL == value)
{
Expand Down Expand Up @@ -1650,18 +1649,7 @@ qpidmsgPayload_addMsg (msgPayload msg,
pn_data_put_list (impl->mBody);
pn_data_enter (impl->mBody);

/*
* addBareMsg expects a mamaMsg, so we must detach payload to create one
* here
*/

status = qpidmsgPayloadImpl_payloadToMamaMsg ((qpidmsgPayloadImpl*) value,
&tmpMsg);

qpidmsgPayloadImpl_addBareMsg (msg, tmpMsg);

/* finished with the temporary message - destroy */
mamaMsg_destroy (tmpMsg);
qpidmsgPayloadImpl_addBareMsg (msg, value);

/* Exit list */
pn_data_exit (impl->mBody);
Expand Down Expand Up @@ -2368,12 +2356,9 @@ mama_status
qpidmsgPayload_updateSubMsg (msgPayload msg,
const char* name,
mama_fid_t fid,
const msgPayload subMsg)
const mamaMsg subMsg)
{
qpidmsgPayloadImpl* impl = (qpidmsgPayloadImpl*) msg;

/* Despite the prototype, subMsg seems to be a mamaMsg, so treat as such */
mamaMsg valMsg = (mamaMsg) subMsg;
mama_status status = MAMA_STATUS_OK;

if (NULL == impl)
Expand All @@ -2398,7 +2383,7 @@ qpidmsgPayload_updateSubMsg (msgPayload msg,
pn_data_put_list (impl->mBody);
pn_data_enter (impl->mBody);

status = qpidmsgPayloadImpl_addBareMsg (msg, valMsg);
status = qpidmsgPayloadImpl_addBareMsg (msg, subMsg);

pn_data_exit (impl->mBody);

Expand Down Expand Up @@ -4077,7 +4062,14 @@ qpidmsgPayloadImpl_addFieldToPayload (msgPayload msg,
{
/* Get the message implementation from the field's array */
qpidmsgPayloadImpl* impl = (qpidmsgPayloadImpl*)field->mDataVector[0];
return qpidmsgPayload_addMsg (msg, name, fid, impl);
mamaMsg tmpMsg = NULL;
mama_status status = qpidmsgPayloadImpl_payloadToMamaMsg (impl,
&tmpMsg);
if (status != MAMA_STATUS_OK) return status;

status = qpidmsgPayload_addMsg (msg, name, fid, tmpMsg);
mamaMsg_destroy (tmpMsg);
return status;
break;
}
case MAMA_FIELD_TYPE_OPAQUE:
Expand Down
4 changes: 2 additions & 2 deletions mama/c_cpp/src/c/payload/qpidmsg/qpidpayloadfunctions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ mama_status
qpidmsgPayload_addMsg (msgPayload msg,
const char* name,
mama_fid_t fid,
msgPayload value);
mamaMsg value);

/*=========================================================================
= Payload Add Vector Field Methods =
Expand Down Expand Up @@ -831,7 +831,7 @@ mama_status
qpidmsgPayload_updateSubMsg (msgPayload msg,
const char* fname,
mama_fid_t fid,
const msgPayload subMsg);
const mamaMsg subMsg);


/*=========================================================================
Expand Down
4 changes: 2 additions & 2 deletions mama/c_cpp/src/c/payloadbridge.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ typedef mama_status
(*msgPayload_addMsg) (msgPayload msg,
const char* name,
mama_fid_t fid,
msgPayload value);
mamaMsg value);
typedef mama_status
(*msgPayload_addVectorBool) (msgPayload msg,
const char* name,
Expand Down Expand Up @@ -405,7 +405,7 @@ typedef mama_status
(*msgPayload_updateSubMsg) (msgPayload msg,
const char* fname,
mama_fid_t fid,
const msgPayload subMsg);
const mamaMsg subMsg);
typedef mama_status
(*msgPayload_updateVectorMsg) (msgPayload msg,
const char* fname,
Expand Down
5 changes: 4 additions & 1 deletion mama/c_cpp/src/cpp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ set(sources
)

add_library(mamacpp SHARED ${sources})
add_library(mamacppstatic STATIC ${sources})
target_link_libraries(mamacpp mama)
target_link_libraries(mamacppstatic mamastatic)

set_target_properties(mamacpp PROPERTIES OUTPUT_NAME "mamacpp${OPENMAMA_LIBRARY_SUFFIX}")
install(TARGETS mamacpp
set_target_properties(mamacppstatic PROPERTIES OUTPUT_NAME "mamacpp${OPENMAMA_LIBRARY_STATIC_SUFFIX}")
install(TARGETS mamacpp mamacppstatic
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
Expand Down
21 changes: 12 additions & 9 deletions mama/c_cpp/src/gunittest/c/mamamsg/msggeneraltests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,24 @@ class MsgGeneralTestsC : public ::testing::Test
{
mama_loadPayloadBridge (&mPayloadBridge, getPayload());
mama_loadBridge (&mMiddlewareBridge, getMiddleware());
mama_open();

}

virtual ~MsgGeneralTestsC(void)
{
mama_close();

};

virtual void SetUp(void)
{
mama_open();
mamaMsg_create (&mMsg);
};

virtual void TearDown(void)
{
mamaMsg_destroy(mMsg);
mama_close();
};

mamaMsg mMsg;
Expand Down Expand Up @@ -338,6 +340,7 @@ TEST_F (MsgGeneralTestsC, msgGetNumFieldsSubMessage)
EXPECT_EQ (addedFields, numFields);

ASSERT_EQ (MAMA_STATUS_OK, mamaMsg_destroy (submsg));
submsg = NULL;
}

TEST_F (MsgGeneralTestsC, msgGetPayloadTypeValid)
Expand Down Expand Up @@ -415,7 +418,7 @@ TEST_F (MsgGeneralTestsC, msgIterateFieldsInValidMsg)
ASSERT_EQ (mamaMsg_iterateFields (NULL, callback, dict, closure), MAMA_STATUS_NULL_ARG);
}

TEST_F (MsgGeneralTestsC, DISABLED_msgIterateFieldsInValidCallback)
TEST_F (MsgGeneralTestsC, msgIterateFieldsInValidCallback)
{
const mamaDictionary dict = NULL;
void* closure = 0;
Expand All @@ -427,7 +430,7 @@ TEST_F (MsgGeneralTestsC, DISABLED_msgIterateFieldsInValidCallback)
ASSERT_EQ (mamaMsg_iterateFields (mMsg, NULL, dict, closure), MAMA_STATUS_NULL_ARG);
}

TEST_F (MsgGeneralTestsC, DISABLED_msgIterateFieldsInValidDict)
TEST_F (MsgGeneralTestsC, msgIterateFieldsInValidDict)
{
mamaMsgIteratorCb callback = NULL;
void* closure = 0;
Expand All @@ -439,7 +442,7 @@ TEST_F (MsgGeneralTestsC, DISABLED_msgIterateFieldsInValidDict)
ASSERT_EQ (mamaMsg_iterateFields (mMsg, callback, NULL, closure), MAMA_STATUS_NULL_ARG);
}

TEST_F (MsgGeneralTestsC, DISABLED_msgIterateFieldsInValidClosure)
TEST_F (MsgGeneralTestsC, msgIterateFieldsInValidClosure)
{
mamaMsgIteratorCb callback = NULL;
const mamaDictionary dict = NULL;
Expand Down Expand Up @@ -485,7 +488,7 @@ TEST_F (MsgGeneralTestsC, msgImplSetQueueInValidQueue)
}

/*
TEST_F (MsgGeneralTestsC, DISABLED_msgImplSetDqStrategyContextValid)
TEST_F (MsgGeneralTestsC, msgImplSetDqStrategyContextValid)
{
mamaMsg mMsg = NULL;
//mamaDqContext dqStrategyContext = NULL;
Expand All @@ -499,7 +502,7 @@ TEST_F (MsgGeneralTestsC, DISABLED_msgImplSetDqStrategyContextValid)
ASSERT_EQ (mamaMsgImpl_setDqStrategyContext(mMsg, &dqStrategyContext), MAMA_STATUS_OK);
}
TEST_F (MsgGeneralTestsC, DISABLED_msgImplSetDqStrategyContextInValidMsg)
TEST_F (MsgGeneralTestsC, msgImplSetDqStrategyContextInValidMsg)
{
mamaMsg mMsg = NULL;
//mamaDqContext dqStrategyContext = NULL;
Expand All @@ -513,7 +516,7 @@ TEST_F (MsgGeneralTestsC, DISABLED_msgImplSetDqStrategyContextInValidMsg)
ASSERT_EQ (mamaMsgImpl_setDqStrategyContext(NULL, &dqStrategyContext), MAMA_STATUS_NULL_ARG);
}
TEST_F (MsgGeneralTestsC, DISABLED_msgImplSetDqStrategyContextInValidDq)
TEST_F (MsgGeneralTestsC, msgImplSetDqStrategyContextInValidDq)
{
mamaMsg mMsg = NULL;
//mamaDqContext dqStrategyContext = NULL;
Expand Down Expand Up @@ -957,7 +960,7 @@ TEST_F (MsgGeneralTestsC, msgSetNewBufferInValidMsg)
ASSERT_EQ (mamaMsg_setNewBuffer(NULL, &buffer, size), MAMA_STATUS_NULL_ARG);
}

TEST_F (MsgGeneralTestsC, DISABLED_msgSetNewBufferInValidBuffer)
TEST_F (MsgGeneralTestsC, msgSetNewBufferInValidBuffer)
{
mamaMsg mMsg = NULL;
const void* buffer = NULL;
Expand Down
Loading

0 comments on commit 3aec8db

Please sign in to comment.