Merge pull request #638 from Niko-Klaiber/add_c_generator

Add a generator for C

Author: tmontgomery

CMakeLists.txt

@@ -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")
 
@@ -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()
 

sbe-benchmarks/src/main/cpp/CMakeLists.txt

@@ -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)
@@ -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)

sbe-samples/src/main/cpp/CMakeLists.txt

@@ -17,23 +17,23 @@
 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)
 
 add_custom_command(
     OUTPUT ${GENERATED_CODECS}
     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)

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGeneratorLoader.java

@@ -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;
@@ -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)