Skip to content

Add a generator for C #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 13, 2019
Merged

Add a generator for C #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a9825d
[C++] Generate codecs in a language specific directory.
Niko-Klaiber Jan 16, 2019
0b17346
[C] Set C standard to C11 without extensions.
Niko-Klaiber Feb 1, 2019
70b0418
Add a generator for C.
Niko-Klaiber Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ if(NOT DEFINED CMAKE_CXX_EXTENSIONS)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()

if(NOT DEFINED CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 11)
endif()

if(NOT DEFINED CMAKE_C_EXTENSIONS)
set(CMAKE_C_EXTENSIONS OFF)
endif()

if(SBE_TESTS)
set(SBE_THIRDPARTY_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty")

Expand Down Expand Up @@ -121,13 +129,16 @@ add_custom_target(sbe-jar
)

set(CODEC_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
set(C_CODEC_TARGET_DIR "${CODEC_TARGET_DIR}/c")
set(CXX_CODEC_TARGET_DIR "${CODEC_TARGET_DIR}/cpp")
set(CODEC_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/test/resources")
set(CODEC_PERF_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-benchmarks/src/main/resources")
set(CODEC_EXAMPLES_SCHEMA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-samples/src/main/resources")

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/main/cpp)

if(SBE_TESTS)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/test/c)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sbe-tool/src/test/cpp)
endif()

Expand Down
10 changes: 5 additions & 5 deletions sbe-benchmarks/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ endif ()
set(SRCS_BENCHLET_MAIN benchlet-main.cpp)

set(GENERATED_CODECS
${CODEC_TARGET_DIR}/uk_co_real_logic_sbe_examples_car
${CODEC_TARGET_DIR}/uk_co_real_logic_sbe_samples_fix
${CXX_CODEC_TARGET_DIR}/uk_co_real_logic_sbe_examples_car
${CXX_CODEC_TARGET_DIR}/uk_co_real_logic_sbe_samples_fix
)

set(SBE_CAR_SCHEMA ${CODEC_PERF_SCHEMA_DIR}/car.xml)
Expand All @@ -39,15 +39,15 @@ set(SBE_MD_SCHEMA ${CODEC_PERF_SCHEMA_DIR}/fix-message-samples.xml)
add_custom_command(
OUTPUT ${GENERATED_CODECS}
DEPENDS ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA} sbe-jar ${SBE_JAR}
COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CODEC_TARGET_DIR} -Dsbe.target.language="cpp" -jar ${SBE_JAR} ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA}
COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CXX_CODEC_TARGET_DIR} -Dsbe.target.language="cpp" -jar ${SBE_JAR} ${SBE_CAR_SCHEMA} ${SBE_MD_SCHEMA}
)
add_custom_target(perf_codecs DEPENDS ${GENERATED_CODECS})

add_executable(benchlet-sbe-car-runner ${SRCS_BENCHLET_MAIN} CarBench.cpp)
target_include_directories(benchlet-sbe-car-runner PRIVATE ${CODEC_TARGET_DIR})
target_include_directories(benchlet-sbe-car-runner PRIVATE ${CXX_CODEC_TARGET_DIR})
target_link_libraries(benchlet-sbe-car-runner sbe)
add_executable(benchlet-sbe-md-runner ${SRCS_BENCHLET_MAIN} MarketDataBench.cpp)
target_include_directories(benchlet-sbe-md-runner PRIVATE ${CODEC_TARGET_DIR})
target_include_directories(benchlet-sbe-md-runner PRIVATE ${CXX_CODEC_TARGET_DIR})
target_link_libraries(benchlet-sbe-md-runner sbe)
add_dependencies(benchlet-sbe-md-runner perf_codecs)
add_dependencies(benchlet-sbe-car-runner perf_codecs)
Expand Down
8 changes: 4 additions & 4 deletions sbe-samples/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
find_package(Java REQUIRED)

set(GENERATED_CODECS
${CODEC_TARGET_DIR}/baseline
${CXX_CODEC_TARGET_DIR}/baseline
)

set(EXAMPLES_SCHEMA ${CODEC_EXAMPLES_SCHEMA_DIR}/example-schema.xml)
Expand All @@ -26,15 +26,15 @@ add_custom_command(
OUTPUT ${GENERATED_CODECS}
WORKING_DIRECTORY ${CODEC_EXAMPLES_SCHEMA_DIR}
DEPENDS ${EXAMPLES_SCHEMA} sbe-jar ${SBE_JAR}
COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CODEC_TARGET_DIR} -Dsbe.generate.ir=true -Dsbe.target.language=cpp -Dsbe.xinclude.aware=true -jar ${SBE_JAR} ${EXAMPLES_SCHEMA}
COMMAND ${Java_JAVA_EXECUTABLE} -Dsbe.output.dir=${CXX_CODEC_TARGET_DIR} -Dsbe.generate.ir=true -Dsbe.target.language=cpp -Dsbe.xinclude.aware=true -jar ${SBE_JAR} ${EXAMPLES_SCHEMA}
)
add_custom_target(examples_codecs DEPENDS ${GENERATED_CODECS})

add_executable(GeneratedStubExample GeneratedStubExample.cpp)
target_include_directories(GeneratedStubExample PRIVATE ${CODEC_TARGET_DIR})
target_include_directories(GeneratedStubExample PRIVATE ${CXX_CODEC_TARGET_DIR})
target_link_libraries(GeneratedStubExample sbe)
add_executable(OtfExample OtfExample.cpp)
target_include_directories(OtfExample PRIVATE ${CODEC_TARGET_DIR})
target_include_directories(OtfExample PRIVATE ${CXX_CODEC_TARGET_DIR})
target_link_libraries(OtfExample sbe)

add_dependencies(GeneratedStubExample examples_codecs)
Expand Down
10 changes: 10 additions & 0 deletions sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGeneratorLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package uk.co.real_logic.sbe.generation;

import org.agrona.generation.PackageOutputManager;
import uk.co.real_logic.sbe.generation.c.CGenerator;
import uk.co.real_logic.sbe.generation.c.COutputManager;
import uk.co.real_logic.sbe.generation.cpp.CppGenerator;
import uk.co.real_logic.sbe.generation.cpp.NamespaceOutputManager;
import uk.co.real_logic.sbe.generation.golang.GolangGenerator;
Expand All @@ -42,6 +44,14 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)
}
},

C()
{
public CodeGenerator newInstance(final Ir ir, final String outputDir)
{
return new CGenerator(ir, new COutputManager(outputDir, ir.applicableNamespace()));
}
},

CPP()
{
public CodeGenerator newInstance(final Ir ir, final String outputDir)
Expand Down
Loading