Make the Mock API in rdkafka_mock.h part of the public API

Author: edenhill

debian/librdkafka-dev.install

@@ -1,5 +1,6 @@
 usr/include/*/rdkafka.h
 usr/include/*/rdkafkacpp.h
+usr/include/*/rdkafka_mock.h
 usr/lib/*/librdkafka.a
 usr/lib/*/librdkafka.so
 usr/lib/*/librdkafka++.a

packaging/nuget/packaging.py

@@ -321,6 +321,7 @@ def build (self, buildtype):
         mappings = [
             [{'arch': 'x64', 'plat': 'linux', 'fname_glob': 'librdkafka-gcc.tar.gz'}, './include/librdkafka/rdkafka.h', 'build/native/include/librdkafka/rdkafka.h'],
             [{'arch': 'x64', 'plat': 'linux', 'fname_glob': 'librdkafka-gcc.tar.gz'}, './include/librdkafka/rdkafkacpp.h', 'build/native/include/librdkafka/rdkafkacpp.h'],
+            [{'arch': 'x64', 'plat': 'linux', 'fname_glob': 'librdkafka-gcc.tar.gz'}, './include/librdkafka/rdkafka_mock.h', 'build/native/include/librdkafka/rdkafka_mock.h'],
 
             # Travis OSX build
             [{'arch': 'x64', 'plat': 'osx', 'fname_glob': 'librdkafka-clang.tar.gz'}, './lib/librdkafka.dylib', 'runtimes/osx-x64/native/librdkafka.dylib'],
@@ -422,6 +423,7 @@ def verify (self, path):
             "build/native/librdkafka.redist.targets",
             "build/native/include/librdkafka/rdkafka.h",
             "build/native/include/librdkafka/rdkafkacpp.h",
+            "build/native/include/librdkafka/rdkafka_mock.h",
             "build/native/lib/win/x64/win-x64-Release/v120/librdkafka.lib",
             "build/native/lib/win/x64/win-x64-Release/v120/librdkafkacpp.lib",
             "build/native/lib/win/x86/win-x86-Release/v120/librdkafka.lib",

src/CMakeLists.txt

@@ -302,6 +302,6 @@ install(
 )
 
 install(
-    FILES "rdkafka.h"
+    FILES "rdkafka.h" "rdkafka_mock.h"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/librdkafka"
 )

src/Makefile

@@ -51,7 +51,7 @@ SRCS=		rdkafka.c rdkafka_broker.c rdkafka_msg.c rdkafka_topic.c \
 		rdkafka_mock.c rdkafka_mock_handlers.c \
 		$(SRCS_y)
 
-HDRS=		rdkafka.h
+HDRS=		rdkafka.h rdkafka_mock.h
 
 OBJS=		$(SRCS:.c=.o)
 

src/rdkafka_mock.h

@@ -29,6 +29,11 @@
 #ifndef _RDKAFKA_MOCK_H_
 #define _RDKAFKA_MOCK_H_
 
+#ifndef _RDKAFKA_H_
+#error "rdkafka_mock.h must be included after rdkafka.h"
+#endif
+
+
 
 /**
  * @name Mock cluster
@@ -79,13 +84,15 @@ typedef struct rd_kafka_mock_cluster_s rd_kafka_mock_cluster_t;
  * The \p rk instance is required for internal book keeping but continues
  * to operate as usual.
  */
+RD_EXPORT
 rd_kafka_mock_cluster_t *rd_kafka_mock_cluster_new (rd_kafka_t *rk,
                                                     int broker_cnt);
 
 
 /**
  * @brief Destroy mock cluster.
  */
+RD_EXPORT
 void rd_kafka_mock_cluster_destroy (rd_kafka_mock_cluster_t *mcluster);
 
 
@@ -94,15 +101,15 @@ void rd_kafka_mock_cluster_destroy (rd_kafka_mock_cluster_t *mcluster);
  * @returns the rd_kafka_t instance for a cluster as passed to
  *          rd_kafka_mock_cluster_new().
  */
-rd_kafka_t *
+RD_EXPORT rd_kafka_t *
 rd_kafka_mock_cluster_handle (const rd_kafka_mock_cluster_t *mcluster);
 
 
 
 /**
  * @returns the mock cluster's bootstrap.servers list
  */
-const char *
+RD_EXPORT const char *
 rd_kafka_mock_cluster_bootstraps (const rd_kafka_mock_cluster_t *mcluster);
 
 
@@ -116,6 +123,7 @@ rd_kafka_mock_cluster_bootstraps (const rd_kafka_mock_cluster_t *mcluster);
  * provided error code and removed from the stack, starting with
  * the first error code, then the second, etc.
  */
+RD_EXPORT
 void rd_kafka_mock_push_request_errors (rd_kafka_mock_cluster_t *mcluster,
                                         int16_t ApiKey, size_t cnt, ...);
 
@@ -124,6 +132,7 @@ void rd_kafka_mock_push_request_errors (rd_kafka_mock_cluster_t *mcluster,
  *
  * Currently only used for TopicMetadataRequest and AddPartitionsToTxnRequest.
  */
+RD_EXPORT
 void rd_kafka_mock_topic_set_error (rd_kafka_mock_cluster_t *mcluster,
                                     const char *topic,
                                     rd_kafka_resp_err_t err);
@@ -133,13 +142,15 @@ void rd_kafka_mock_topic_set_error (rd_kafka_mock_cluster_t *mcluster,
  *
  * \p broker_id does not need to point to an existing broker.
  */
+RD_EXPORT
 void rd_kafka_mock_partition_set_follower (rd_kafka_mock_cluster_t *mcluster,
                                            const char *topic, int32_t partition,
                                            int32_t broker_id);
 
 /**
  * @brief Set's the broker's rack as reported in Metadata to the client.
  */
+RD_EXPORT
 void rd_kafka_mock_broker_set_rack (rd_kafka_mock_cluster_t *mcluster,
                                     int32_t broker_id, const char *rack);
 

win32/librdkafka.autopkg.template

@@ -35,7 +35,7 @@ nuget {
     };
 	nestedInclude: {
 		#destination = ${d_include}librdkafka;
-		${TOPDIR}src\rdkafka.h, ${TOPDIR}src-cpp\rdkafkacpp.h
+		${TOPDIR}src\rdkafka.h, ${TOPDIR}src\rdkafka_mock.h, ${TOPDIR}src-cpp\rdkafkacpp.h
 	};
 	docs: { ${TOPDIR}README.md, ${TOPDIR}CONFIGURATION.md, ${TOPDIR}LICENSES.txt };