Rename q_globals to ddsi_domaingv

The name (not its definition) now leaks out in ddsi_sertopic, and the
messy old names really shouldn't pollute the interface any more than
necessary.

Signed-off-by: Erik Boasson <eb@ilities.com>

src/core/ddsc/src/dds__rhc_default.h

@@ -19,11 +19,11 @@ extern "C" {
 struct dds_rhc;
 struct dds_reader;
 struct ddsi_sertopic;
-struct q_globals;
+struct ddsi_domaingv;
 struct dds_rhc_default;
 struct rhc_sample;
 
-DDS_EXPORT struct dds_rhc *dds_rhc_default_new_xchecks (dds_reader *reader, struct q_globals *gv, const struct ddsi_sertopic *topic, bool xchecks);
+DDS_EXPORT struct dds_rhc *dds_rhc_default_new_xchecks (dds_reader *reader, struct ddsi_domaingv *gv, const struct ddsi_sertopic *topic, bool xchecks);
 DDS_EXPORT struct dds_rhc *dds_rhc_default_new (struct dds_reader *reader, const struct ddsi_sertopic *topic);
 #ifdef DDSI_INCLUDE_LIFESPAN
 DDS_EXPORT nn_mtime_t dds_rhc_default_sample_expired_cb(void *hc, nn_mtime_t tnow);

src/core/ddsc/src/dds__serdata_builtintopic.h

@@ -33,7 +33,7 @@ enum ddsi_sertopic_builtintopic_type {
   DSBT_WRITER
 };
 
-struct q_globals;
+struct ddsi_domaingv;
 struct ddsi_sertopic_builtintopic {
   struct ddsi_sertopic c;
   enum ddsi_sertopic_builtintopic_type type;

src/core/ddsc/src/dds__types.h

@@ -17,7 +17,7 @@
 #include "dds/dds.h"
 #include "dds/ddsrt/sync.h"
 #include "dds/ddsi/q_rtps.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsrt/avl.h"
 #include "dds/ddsi/ddsi_builtin_topic_if.h"
 #include "dds__handles.h"
@@ -227,7 +227,7 @@ typedef struct dds_domain {
   struct local_orphan_writer *builtintopic_writer_subscriptions;
 
   struct ddsi_builtin_topic_interface btif;
-  struct q_globals gv;
+  struct ddsi_domaingv gv;
 } dds_domain;
 
 typedef struct dds_subscriber {

src/core/ddsc/src/dds__whc.h

@@ -18,11 +18,11 @@
 extern "C" {
 #endif
 
-struct q_globals;
+struct ddsi_domaingv;
 struct whc_writer_info;
 struct dds_writer;
 
-struct whc *whc_new (struct q_globals *gv, const struct whc_writer_info *wrinfo);
+struct whc *whc_new (struct ddsi_domaingv *gv, const struct whc_writer_info *wrinfo);
 struct whc_writer_info *whc_make_wrinfo (struct dds_writer *wr, const dds_qos_t *qos);
 void whc_free_wrinfo (struct whc_writer_info *);
 

src/core/ddsc/src/dds_builtin.c

@@ -15,7 +15,7 @@
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_thread.h"
 #include "dds/ddsi/q_config.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/q_plist.h" /* for nn_keyhash */
 #include "dds__init.h"
 #include "dds__domain.h"

src/core/ddsc/src/dds_domain.c

@@ -27,7 +27,7 @@
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/q_gc.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 
 static dds_return_t dds_domain_free (dds_entity *vdomain);
 

src/core/ddsc/src/dds_init.c

@@ -30,7 +30,7 @@
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/q_gc.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/version.h"
 
 static void dds_close (struct dds_entity *e);

src/core/ddsc/src/dds_instance.c

@@ -21,7 +21,7 @@
 #include "dds/ddsi/ddsi_serdata.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_thread.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 
 dds_return_t dds_writedispose (dds_entity_t writer, const void *data)
 {

src/core/ddsc/src/dds_matched.c

@@ -15,7 +15,7 @@
 #include "dds/dds.h"
 #include "dds/version.h"
 #include "dds/ddsi/q_config.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/ddsi_entity_index.h"
 #include "dds/ddsi/q_thread.h"

src/core/ddsc/src/dds_participant.c

@@ -18,7 +18,7 @@
 #include "dds/ddsi/q_thread.h"
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/q_plist.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/ddsi_entity_index.h"
 #include "dds/version.h"
 #include "dds__init.h"

src/core/ddsc/src/dds_publisher.c

@@ -19,7 +19,7 @@
 #include "dds__qos.h"
 #include "dds/ddsi/ddsi_iid.h"
 #include "dds/ddsi/q_entity.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/version.h"
 
 DECL_ENTITY_LOCK_UNLOCK (extern inline, dds_publisher)

src/core/ddsc/src/dds_read.c

@@ -18,7 +18,7 @@
 #include "dds/ddsi/q_thread.h"
 #include "dds/ddsi/ddsi_entity_index.h"
 #include "dds/ddsi/q_entity.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/ddsi_sertopic.h"
 
 /*

src/core/ddsc/src/dds_reader.c

@@ -26,7 +26,7 @@
 #include "dds__qos.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_thread.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds__builtin.h"
 #include "dds/ddsi/ddsi_sertopic.h"
 #include "dds/ddsi/ddsi_entity_index.h"

src/core/ddsc/src/dds_rhc_default.c

@@ -35,7 +35,7 @@
 #include "dds/ddsi/q_xqos.h"
 #include "dds/ddsi/q_unused.h"
 #include "dds/ddsi/q_config.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/q_radmin.h" /* sampleinfo */
 #include "dds/ddsi/q_entity.h" /* proxy_writer_info */
 #include "dds/ddsi/ddsi_serdata.h"
@@ -273,13 +273,13 @@ struct rhc_instance {
   uint32_t disposed_gen;       /* bloody generation counters - worst invention of mankind */
   uint32_t no_writers_gen;     /* __/ */
   int32_t strength;            /* "current" ownership strength */
-  ddsi_guid_t wr_guid;           /* guid of last writer (if wr_iid != 0 then wr_guid is the corresponding guid, else undef) */
+  ddsi_guid_t wr_guid;         /* guid of last writer (if wr_iid != 0 then wr_guid is the corresponding guid, else undef) */
   nn_wctime_t tstamp;          /* source time stamp of last update */
   struct ddsrt_circlist_elem nonempty_list; /* links non-empty instances in arbitrary ordering */
 #ifdef DDSI_INCLUDE_DEADLINE_MISSED
   struct deadline_elem deadline; /* element in deadline missed administration */
 #endif
-  struct ddsi_tkmap_instance *tk;   /* backref into TK for unref'ing */
+  struct ddsi_tkmap_instance *tk;/* backref into TK for unref'ing */
   struct rhc_sample a_sample;  /* pre-allocated storage for 1 sample */
 };
 
@@ -318,7 +318,7 @@ struct dds_rhc_default {
 
   dds_reader *reader;                /* reader -- may be NULL (used by rhc_torture) */
   struct ddsi_tkmap *tkmap;          /* back pointer to tkmap */
-  struct q_globals *gv;              /* globals -- so far only for log config */
+  struct ddsi_domaingv *gv;          /* globals -- so far only for log config */
   const struct ddsi_sertopic *topic; /* topic description */
   uint32_t history_depth;            /* depth, 1 for KEEP_LAST_1, 2**32-1 for KEEP_ALL */
 
@@ -637,7 +637,7 @@ nn_mtime_t dds_rhc_default_deadline_missed_cb(void *hc, nn_mtime_t tnow)
 }
 #endif /* DDSI_INCLUDE_DEADLINE_MISSED */
 
-struct dds_rhc *dds_rhc_default_new_xchecks (dds_reader *reader, struct q_globals *gv, const struct ddsi_sertopic *topic, bool xchecks)
+struct dds_rhc *dds_rhc_default_new_xchecks (dds_reader *reader, struct ddsi_domaingv *gv, const struct ddsi_sertopic *topic, bool xchecks)
 {
   struct dds_rhc_default *rhc = ddsrt_malloc (sizeof (*rhc));
   memset (rhc, 0, sizeof (*rhc));

src/core/ddsc/src/dds_subscriber.c

@@ -16,7 +16,7 @@
 #include "dds__qos.h"
 #include "dds/ddsi/ddsi_iid.h"
 #include "dds/ddsi/q_entity.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsrt/heap.h"
 #include "dds/version.h"
 

src/core/ddsc/src/dds_topic.c

@@ -31,7 +31,7 @@
 #include "dds/ddsi/q_ddsi_discovery.h"
 #include "dds/ddsi/ddsi_iid.h"
 #include "dds/ddsi/q_plist.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds__serdata_builtintopic.h"
 
 DECL_ENTITY_LOCK_UNLOCK (extern inline, dds_topic)
@@ -222,7 +222,7 @@ const struct dds_entity_deriver dds_entity_deriver_topic = {
 */
 static dds_return_t lookup_and_check_ktopic (struct dds_ktopic **ktp_out, dds_participant *pp, const char *name, const char *type_name, const dds_qos_t *new_qos)
 {
-  struct q_globals * const gv = &pp->m_entity.m_domain->gv;
+  struct ddsi_domaingv * const gv = &pp->m_entity.m_domain->gv;
   struct dds_ktopic *ktp;
   if ((ktp = *ktp_out = ddsrt_avl_lookup (&participant_ktopics_treedef, &pp->m_ktopics, name)) == NULL)
   {
@@ -315,7 +315,7 @@ dds_entity_t dds_create_topic_arbitrary (dds_entity_t participant, struct ddsi_s
    * Leaving the topic QoS sparse means a default-default topic QoS of
    * best-effort will do "the right thing" and let a writer still default to
    * reliable ... (and keep behaviour unchanged) */
-  struct q_globals * const gv = &pp->m_entity.m_domain->gv;
+  struct ddsi_domaingv * const gv = &pp->m_entity.m_domain->gv;
   if ((rc = nn_xqos_valid (&gv->logconfig, new_qos)) != DDS_RETCODE_OK)
   {
     dds_delete_qos (new_qos);

src/core/ddsc/src/dds_whc.c

@@ -31,7 +31,7 @@
 #include "dds/ddsi/q_time.h"
 #include "dds/ddsi/q_rtps.h"
 #include "dds/ddsi/q_freelist.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds__whc.h"
 #include "dds__entity.h"
@@ -103,7 +103,7 @@ struct whc_impl {
   uint32_t fragment_size;
   uint64_t total_bytes; /* total number of bytes pushed in */
   unsigned xchecks: 1;
-  struct q_globals *gv;
+  struct ddsi_domaingv *gv;
   struct ddsi_tkmap *tkmap;
   struct whc_writer_info wrinfo;
   seqno_t max_drop_seq; /* samples in whc with seq <= max_drop_seq => transient-local */
@@ -439,7 +439,7 @@ void whc_free_wrinfo (struct whc_writer_info *wrinfo)
   ddsrt_free (wrinfo);
 }
 
-struct whc *whc_new (struct q_globals *gv, const struct whc_writer_info *wrinfo)
+struct whc *whc_new (struct ddsi_domaingv *gv, const struct whc_writer_info *wrinfo)
 {
   size_t sample_overhead = 80; /* INFO_TS, DATA (estimate), inline QoS */
   struct whc_impl *whc;

src/core/ddsc/src/dds_whc_builtintopic.c

@@ -19,7 +19,7 @@
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/ddsi_entity_index.h"
 #include "dds/ddsi/q_entity.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/ddsi_tkmap.h"
 #include "dds__serdata_builtintopic.h"
 #include "dds__whc_builtintopic.h"

src/core/ddsc/src/dds_write.c

@@ -24,7 +24,7 @@
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_radmin.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/ddsi_deliver_locally.h"
 
 dds_return_t dds_write (dds_entity_t writer, const void *data)
@@ -93,7 +93,7 @@ struct local_sourceinfo {
   nn_mtime_t timeout;
 };
 
-static struct ddsi_serdata *local_make_sample (struct ddsi_tkmap_instance **tk, struct q_globals *gv, struct ddsi_sertopic const * const topic, void *vsourceinfo)
+static struct ddsi_serdata *local_make_sample (struct ddsi_tkmap_instance **tk, struct ddsi_domaingv *gv, struct ddsi_sertopic const * const topic, void *vsourceinfo)
 {
   struct local_sourceinfo *si = vsourceinfo;
   if (topic == si->src_topic)

src/core/ddsc/src/dds_writer.c

@@ -15,7 +15,7 @@
 #include "dds/version.h"
 #include "dds/ddsrt/static_assert.h"
 #include "dds/ddsi/q_config.h"
-#include "dds/ddsi/q_globals.h"
+#include "dds/ddsi/ddsi_domaingv.h"
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_thread.h"
 #include "dds/ddsi/q_xmsg.h"
@@ -181,7 +181,7 @@ static void dds_writer_interrupt (dds_entity *e) ddsrt_nonnull_all;
 
 static void dds_writer_interrupt (dds_entity *e)
 {
-  struct q_globals * const gv = &e->m_domain->gv;
+  struct ddsi_domaingv * const gv = &e->m_domain->gv;
   thread_state_awake (lookup_thread_state (), gv);
   unblock_throttled_writer (gv, &e->m_guid);
   thread_state_asleep (lookup_thread_state ());
@@ -192,7 +192,7 @@ static void dds_writer_close (dds_entity *e) ddsrt_nonnull_all;
 static void dds_writer_close (dds_entity *e)
 {
   struct dds_writer * const wr = (struct dds_writer *) e;
-  struct q_globals * const gv = &e->m_domain->gv;
+  struct ddsi_domaingv * const gv = &e->m_domain->gv;
   struct thread_state1 * const ts1 = lookup_thread_state ();
   thread_state_awake (ts1, gv);
   nn_xpack_send (wr->m_xp, false);