add torture test for read, query conditions
The "rhc" test runs a random sequence of operations (writes, reads, &c.) through an RHC with conditions attached to it. All possible state masks are used, and query conditions are tried with a condition that only tests the key value, and one that tests attribute values. It depends on the internal checking logic of the RHC, which is currently enabled only in Debug builds because of the associated run-time overhead. Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson
parent
a1e827cf7e
commit
1c963b5c3b
26 changed files with 1454 additions and 198 deletions
|
|
@ -13,6 +13,7 @@
|
|||
#define _DDS_IID_H_
|
||||
|
||||
#include "os/os.h"
|
||||
#include "ddsc/dds_export.h"
|
||||
|
||||
#if defined (__cplusplus)
|
||||
extern "C" {
|
||||
|
|
@ -28,9 +29,9 @@ struct ddsi_iid {
|
|||
uint32_t key[4];
|
||||
};
|
||||
|
||||
void ddsi_iid_init (void);
|
||||
void ddsi_iid_fini (void);
|
||||
uint64_t ddsi_iid_gen (void);
|
||||
DDS_EXPORT void ddsi_iid_init (void);
|
||||
DDS_EXPORT void ddsi_iid_fini (void);
|
||||
DDS_EXPORT uint64_t ddsi_iid_gen (void);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ struct ddsi_rhc_plugin
|
|||
void (*rhc_set_qos_fn) (struct rhc * rhc, const struct nn_xqos * qos);
|
||||
};
|
||||
|
||||
void make_proxy_writer_info(struct proxy_writer_info *pwr_info, const struct entity_common *e, const struct nn_xqos *xqos);
|
||||
DDS_EXPORT void make_proxy_writer_info(struct proxy_writer_info *pwr_info, const struct entity_common *e, const struct nn_xqos *xqos);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -108,60 +108,60 @@ struct ddsi_serdata_ops {
|
|||
ddsi_serdata_free_t free;
|
||||
};
|
||||
|
||||
void ddsi_serdata_init (struct ddsi_serdata *d, const struct ddsi_sertopic *tp, enum ddsi_serdata_kind kind);
|
||||
DDS_EXPORT void ddsi_serdata_init (struct ddsi_serdata *d, const struct ddsi_sertopic *tp, enum ddsi_serdata_kind kind);
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_ref (const struct ddsi_serdata *serdata_const) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_ref (const struct ddsi_serdata *serdata_const) {
|
||||
struct ddsi_serdata *serdata = (struct ddsi_serdata *)serdata_const;
|
||||
os_atomic_inc32 (&serdata->refc);
|
||||
return serdata;
|
||||
}
|
||||
|
||||
inline void ddsi_serdata_unref (struct ddsi_serdata *serdata) {
|
||||
DDS_EXPORT inline void ddsi_serdata_unref (struct ddsi_serdata *serdata) {
|
||||
if (os_atomic_dec32_ov (&serdata->refc) == 1)
|
||||
serdata->ops->free (serdata);
|
||||
}
|
||||
|
||||
inline uint32_t ddsi_serdata_size (const struct ddsi_serdata *d) {
|
||||
DDS_EXPORT inline uint32_t ddsi_serdata_size (const struct ddsi_serdata *d) {
|
||||
return d->ops->get_size (d);
|
||||
}
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_from_ser (const struct ddsi_sertopic *topic, enum ddsi_serdata_kind kind, const struct nn_rdata *fragchain, size_t size) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_from_ser (const struct ddsi_sertopic *topic, enum ddsi_serdata_kind kind, const struct nn_rdata *fragchain, size_t size) {
|
||||
return topic->serdata_ops->from_ser (topic, kind, fragchain, size);
|
||||
}
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_from_keyhash (const struct ddsi_sertopic *topic, const struct nn_keyhash *keyhash) {
|
||||
return topic->serdata_ops->from_keyhash (topic, keyhash);
|
||||
}
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_from_sample (const struct ddsi_sertopic *topic, enum ddsi_serdata_kind kind, const void *sample) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_from_sample (const struct ddsi_sertopic *topic, enum ddsi_serdata_kind kind, const void *sample) {
|
||||
return topic->serdata_ops->from_sample (topic, kind, sample);
|
||||
}
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_to_topicless (const struct ddsi_serdata *d) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_to_topicless (const struct ddsi_serdata *d) {
|
||||
return d->ops->to_topicless (d);
|
||||
}
|
||||
|
||||
inline void ddsi_serdata_to_ser (const struct ddsi_serdata *d, size_t off, size_t sz, void *buf) {
|
||||
DDS_EXPORT inline void ddsi_serdata_to_ser (const struct ddsi_serdata *d, size_t off, size_t sz, void *buf) {
|
||||
d->ops->to_ser (d, off, sz, buf);
|
||||
}
|
||||
|
||||
inline struct ddsi_serdata *ddsi_serdata_to_ser_ref (const struct ddsi_serdata *d, size_t off, size_t sz, os_iovec_t *ref) {
|
||||
DDS_EXPORT inline struct ddsi_serdata *ddsi_serdata_to_ser_ref (const struct ddsi_serdata *d, size_t off, size_t sz, os_iovec_t *ref) {
|
||||
return d->ops->to_ser_ref (d, off, sz, ref);
|
||||
}
|
||||
|
||||
inline void ddsi_serdata_to_ser_unref (struct ddsi_serdata *d, const os_iovec_t *ref) {
|
||||
DDS_EXPORT inline void ddsi_serdata_to_ser_unref (struct ddsi_serdata *d, const os_iovec_t *ref) {
|
||||
d->ops->to_ser_unref (d, ref);
|
||||
}
|
||||
|
||||
inline bool ddsi_serdata_to_sample (const struct ddsi_serdata *d, void *sample, void **bufptr, void *buflim) {
|
||||
DDS_EXPORT inline bool ddsi_serdata_to_sample (const struct ddsi_serdata *d, void *sample, void **bufptr, void *buflim) {
|
||||
return d->ops->to_sample (d, sample, bufptr, buflim);
|
||||
}
|
||||
|
||||
inline bool ddsi_serdata_topicless_to_sample (const struct ddsi_sertopic *topic, const struct ddsi_serdata *d, void *sample, void **bufptr, void *buflim) {
|
||||
DDS_EXPORT inline bool ddsi_serdata_topicless_to_sample (const struct ddsi_sertopic *topic, const struct ddsi_serdata *d, void *sample, void **bufptr, void *buflim) {
|
||||
return d->ops->topicless_to_sample (topic, d, sample, bufptr, buflim);
|
||||
}
|
||||
|
||||
inline bool ddsi_serdata_eqkey (const struct ddsi_serdata *a, const struct ddsi_serdata *b) {
|
||||
DDS_EXPORT inline bool ddsi_serdata_eqkey (const struct ddsi_serdata *a, const struct ddsi_serdata *b) {
|
||||
return a->ops->eqkey (a, b);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -125,12 +125,12 @@ struct ddsi_rawcdr_sample {
|
|||
size_t keysize;
|
||||
};
|
||||
|
||||
extern const struct ddsi_sertopic_ops ddsi_sertopic_ops_default;
|
||||
extern DDS_EXPORT const struct ddsi_sertopic_ops ddsi_sertopic_ops_default;
|
||||
|
||||
extern const struct ddsi_serdata_ops ddsi_serdata_ops_cdr;
|
||||
extern const struct ddsi_serdata_ops ddsi_serdata_ops_cdr_nokey;
|
||||
extern const struct ddsi_serdata_ops ddsi_serdata_ops_plist;
|
||||
extern const struct ddsi_serdata_ops ddsi_serdata_ops_rawcdr;
|
||||
extern DDS_EXPORT const struct ddsi_serdata_ops ddsi_serdata_ops_cdr;
|
||||
extern DDS_EXPORT const struct ddsi_serdata_ops ddsi_serdata_ops_cdr_nokey;
|
||||
extern DDS_EXPORT const struct ddsi_serdata_ops ddsi_serdata_ops_plist;
|
||||
extern DDS_EXPORT const struct ddsi_serdata_ops ddsi_serdata_ops_rawcdr;
|
||||
|
||||
struct serdatapool * ddsi_serdatapool_new (void);
|
||||
void ddsi_serdatapool_free (struct serdatapool * pool);
|
||||
|
|
|
|||
|
|
@ -56,32 +56,32 @@ struct ddsi_sertopic_ops {
|
|||
ddsi_sertopic_free_samples_t free_samples;
|
||||
};
|
||||
|
||||
struct ddsi_sertopic *ddsi_sertopic_ref (const struct ddsi_sertopic *tp);
|
||||
void ddsi_sertopic_unref (struct ddsi_sertopic *tp);
|
||||
uint32_t ddsi_sertopic_compute_serdata_basehash (const struct ddsi_serdata_ops *ops);
|
||||
DDS_EXPORT struct ddsi_sertopic *ddsi_sertopic_ref (const struct ddsi_sertopic *tp);
|
||||
DDS_EXPORT void ddsi_sertopic_unref (struct ddsi_sertopic *tp);
|
||||
DDS_EXPORT uint32_t ddsi_sertopic_compute_serdata_basehash (const struct ddsi_serdata_ops *ops);
|
||||
|
||||
inline void ddsi_sertopic_deinit (struct ddsi_sertopic *tp) {
|
||||
DDS_EXPORT inline void ddsi_sertopic_deinit (struct ddsi_sertopic *tp) {
|
||||
tp->ops->deinit (tp);
|
||||
}
|
||||
inline void ddsi_sertopic_zero_samples (const struct ddsi_sertopic *tp, void *samples, size_t count) {
|
||||
DDS_EXPORT inline void ddsi_sertopic_zero_samples (const struct ddsi_sertopic *tp, void *samples, size_t count) {
|
||||
tp->ops->zero_samples (tp, samples, count);
|
||||
}
|
||||
inline void ddsi_sertopic_realloc_samples (void **ptrs, const struct ddsi_sertopic *tp, void *old, size_t oldcount, size_t count)
|
||||
DDS_EXPORT inline void ddsi_sertopic_realloc_samples (void **ptrs, const struct ddsi_sertopic *tp, void *old, size_t oldcount, size_t count)
|
||||
{
|
||||
tp->ops->realloc_samples (ptrs, tp, old, oldcount, count);
|
||||
}
|
||||
inline void ddsi_sertopic_free_samples (const struct ddsi_sertopic *tp, void **ptrs, size_t count, dds_free_op_t op) {
|
||||
DDS_EXPORT inline void ddsi_sertopic_free_samples (const struct ddsi_sertopic *tp, void **ptrs, size_t count, dds_free_op_t op) {
|
||||
tp->ops->free_samples (tp, ptrs, count, op);
|
||||
}
|
||||
inline void ddsi_sertopic_zero_sample (const struct ddsi_sertopic *tp, void *sample) {
|
||||
DDS_EXPORT inline void ddsi_sertopic_zero_sample (const struct ddsi_sertopic *tp, void *sample) {
|
||||
ddsi_sertopic_zero_samples (tp, sample, 1);
|
||||
}
|
||||
inline void *ddsi_sertopic_alloc_sample (const struct ddsi_sertopic *tp) {
|
||||
DDS_EXPORT inline void *ddsi_sertopic_alloc_sample (const struct ddsi_sertopic *tp) {
|
||||
void *ptr;
|
||||
ddsi_sertopic_realloc_samples (&ptr, tp, NULL, 0, 1);
|
||||
return ptr;
|
||||
}
|
||||
inline void ddsi_sertopic_free_sample (const struct ddsi_sertopic *tp, void *sample, dds_free_op_t op) {
|
||||
DDS_EXPORT inline void ddsi_sertopic_free_sample (const struct ddsi_sertopic *tp, void *sample, dds_free_op_t op) {
|
||||
ddsi_sertopic_free_samples (tp, &sample, 1, op);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,19 +30,14 @@ struct ddsi_tkmap_instance
|
|||
os_atomic_uint32_t m_refc;
|
||||
};
|
||||
|
||||
|
||||
struct ddsi_tkmap * ddsi_tkmap_new (void);
|
||||
void ddsi_tkmap_free (_Inout_ _Post_invalid_ struct ddsi_tkmap *tkmap);
|
||||
void ddsi_tkmap_instance_ref (_In_ struct ddsi_tkmap_instance *tk);
|
||||
uint64_t ddsi_tkmap_lookup (_In_ struct ddsi_tkmap *tkmap, _In_ const struct ddsi_serdata *serdata);
|
||||
_Check_return_ struct ddsi_tkmap_instance * ddsi_tkmap_find(
|
||||
_In_ struct ddsi_serdata * sd,
|
||||
_In_ const bool rd,
|
||||
_In_ const bool create);
|
||||
_Check_return_ struct ddsi_tkmap_instance * ddsi_tkmap_find_by_id (_In_ struct ddsi_tkmap * map, _In_ uint64_t iid);
|
||||
|
||||
DDS_EXPORT _Check_return_ struct ddsi_tkmap_instance * ddsi_tkmap_lookup_instance_ref (_In_ struct ddsi_serdata * sd);
|
||||
DDS_EXPORT void ddsi_tkmap_instance_unref (_In_ struct ddsi_tkmap_instance * tk);
|
||||
DDS_EXPORT struct ddsi_tkmap * ddsi_tkmap_new (void);
|
||||
DDS_EXPORT void ddsi_tkmap_free (_Inout_ _Post_invalid_ struct ddsi_tkmap *tkmap);
|
||||
DDS_EXPORT void ddsi_tkmap_instance_ref (_In_ struct ddsi_tkmap_instance *tk);
|
||||
DDS_EXPORT uint64_t ddsi_tkmap_lookup (_In_ struct ddsi_tkmap *tkmap, _In_ const struct ddsi_serdata *serdata);
|
||||
DDS_EXPORT struct ddsi_tkmap_instance * ddsi_tkmap_find(struct ddsi_serdata *sd, const bool rd, const bool create);
|
||||
DDS_EXPORT struct ddsi_tkmap_instance * ddsi_tkmap_find_by_id (struct ddsi_tkmap *map, uint64_t iid);
|
||||
DDS_EXPORT struct ddsi_tkmap_instance * ddsi_tkmap_lookup_instance_ref (struct ddsi_serdata * sd);
|
||||
DDS_EXPORT void ddsi_tkmap_instance_unref (struct ddsi_tkmap_instance *tk);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#ifndef Q_GC_H
|
||||
#define Q_GC_H
|
||||
|
||||
#include "ddsc/dds_export.h"
|
||||
#include "ddsi/q_thread.h"
|
||||
|
||||
#if defined (__cplusplus)
|
||||
|
|
@ -42,14 +43,14 @@ struct gcreq {
|
|||
struct idx_vtime vtimes[1 /* really a flex ary */];
|
||||
};
|
||||
|
||||
struct gcreq_queue *gcreq_queue_new (void);
|
||||
void gcreq_queue_drain (struct gcreq_queue *q);
|
||||
void gcreq_queue_free (struct gcreq_queue *q);
|
||||
DDS_EXPORT struct gcreq_queue *gcreq_queue_new (void);
|
||||
DDS_EXPORT void gcreq_queue_drain (struct gcreq_queue *q);
|
||||
DDS_EXPORT void gcreq_queue_free (struct gcreq_queue *q);
|
||||
|
||||
struct gcreq *gcreq_new (struct gcreq_queue *gcreq_queue, gcreq_cb_t cb);
|
||||
void gcreq_free (struct gcreq *gcreq);
|
||||
void gcreq_enqueue (struct gcreq *gcreq);
|
||||
int gcreq_requeue (struct gcreq *gcreq, gcreq_cb_t cb);
|
||||
DDS_EXPORT struct gcreq *gcreq_new (struct gcreq_queue *gcreq_queue, gcreq_cb_t cb);
|
||||
DDS_EXPORT void gcreq_free (struct gcreq *gcreq);
|
||||
DDS_EXPORT void gcreq_enqueue (struct gcreq *gcreq);
|
||||
DDS_EXPORT int gcreq_requeue (struct gcreq *gcreq, gcreq_cb_t cb);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
#include "util/ut_fibheap.h"
|
||||
|
||||
#include "ddsc/dds_export.h"
|
||||
|
||||
#include "ddsi/q_plist.h"
|
||||
#include "ddsi/q_protocol.h"
|
||||
#include "ddsi/q_nwif.h"
|
||||
|
|
@ -311,7 +313,7 @@ struct q_globals {
|
|||
struct nn_group_membership *mship;
|
||||
};
|
||||
|
||||
extern struct q_globals OSAPI_EXPORT gv;
|
||||
extern struct q_globals DDS_EXPORT gv;
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -204,36 +204,36 @@ typedef struct nn_plist_src {
|
|||
size_t bufsz;
|
||||
} nn_plist_src_t;
|
||||
|
||||
void nn_plist_init_empty (nn_plist_t *dest);
|
||||
void nn_plist_mergein_missing (nn_plist_t *a, const nn_plist_t *b);
|
||||
void nn_plist_copy (nn_plist_t *dst, const nn_plist_t *src);
|
||||
nn_plist_t *nn_plist_dup (const nn_plist_t *src);
|
||||
int nn_plist_init_frommsg (nn_plist_t *dest, char **nextafterplist, uint64_t pwanted, uint64_t qwanted, const nn_plist_src_t *src);
|
||||
void nn_plist_fini (nn_plist_t *ps);
|
||||
void nn_plist_addtomsg (struct nn_xmsg *m, const nn_plist_t *ps, uint64_t pwanted, uint64_t qwanted);
|
||||
int nn_plist_init_default_participant (nn_plist_t *plist);
|
||||
DDS_EXPORT void nn_plist_init_empty (nn_plist_t *dest);
|
||||
DDS_EXPORT void nn_plist_mergein_missing (nn_plist_t *a, const nn_plist_t *b);
|
||||
DDS_EXPORT void nn_plist_copy (nn_plist_t *dst, const nn_plist_t *src);
|
||||
DDS_EXPORT nn_plist_t *nn_plist_dup (const nn_plist_t *src);
|
||||
DDS_EXPORT int nn_plist_init_frommsg (nn_plist_t *dest, char **nextafterplist, uint64_t pwanted, uint64_t qwanted, const nn_plist_src_t *src);
|
||||
DDS_EXPORT void nn_plist_fini (nn_plist_t *ps);
|
||||
DDS_EXPORT void nn_plist_addtomsg (struct nn_xmsg *m, const nn_plist_t *ps, uint64_t pwanted, uint64_t qwanted);
|
||||
DDS_EXPORT int nn_plist_init_default_participant (nn_plist_t *plist);
|
||||
|
||||
int validate_history_qospolicy (const nn_history_qospolicy_t *q);
|
||||
int validate_durability_qospolicy (const nn_durability_qospolicy_t *q);
|
||||
int validate_resource_limits_qospolicy (const nn_resource_limits_qospolicy_t *q);
|
||||
int validate_history_and_resource_limits (const nn_history_qospolicy_t *qh, const nn_resource_limits_qospolicy_t *qr);
|
||||
int validate_durability_service_qospolicy (const nn_durability_service_qospolicy_t *q);
|
||||
int validate_liveliness_qospolicy (const nn_liveliness_qospolicy_t *q);
|
||||
int validate_destination_order_qospolicy (const nn_destination_order_qospolicy_t *q);
|
||||
int validate_ownership_qospolicy (const nn_ownership_qospolicy_t *q);
|
||||
int validate_ownership_strength_qospolicy (const nn_ownership_strength_qospolicy_t *q);
|
||||
int validate_presentation_qospolicy (const nn_presentation_qospolicy_t *q);
|
||||
int validate_transport_priority_qospolicy (const nn_transport_priority_qospolicy_t *q);
|
||||
int validate_reader_data_lifecycle (const nn_reader_data_lifecycle_qospolicy_t *q);
|
||||
int validate_duration (const nn_duration_t *d);
|
||||
DDS_EXPORT int validate_history_qospolicy (const nn_history_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_durability_qospolicy (const nn_durability_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_resource_limits_qospolicy (const nn_resource_limits_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_history_and_resource_limits (const nn_history_qospolicy_t *qh, const nn_resource_limits_qospolicy_t *qr);
|
||||
DDS_EXPORT int validate_durability_service_qospolicy (const nn_durability_service_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_liveliness_qospolicy (const nn_liveliness_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_destination_order_qospolicy (const nn_destination_order_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_ownership_qospolicy (const nn_ownership_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_ownership_strength_qospolicy (const nn_ownership_strength_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_presentation_qospolicy (const nn_presentation_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_transport_priority_qospolicy (const nn_transport_priority_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_reader_data_lifecycle (const nn_reader_data_lifecycle_qospolicy_t *q);
|
||||
DDS_EXPORT int validate_duration (const nn_duration_t *d);
|
||||
|
||||
|
||||
struct nn_rmsg;
|
||||
struct nn_rsample_info;
|
||||
struct nn_rdata;
|
||||
|
||||
unsigned char *nn_plist_quickscan (struct nn_rsample_info *dest, const struct nn_rmsg *rmsg, const nn_plist_src_t *src);
|
||||
const unsigned char *nn_plist_findparam_native_unchecked (const void *src, nn_parameterid_t pid);
|
||||
DDS_EXPORT unsigned char *nn_plist_quickscan (struct nn_rsample_info *dest, const struct nn_rmsg *rmsg, const nn_plist_src_t *src);
|
||||
DDS_EXPORT const unsigned char *nn_plist_findparam_native_unchecked (const void *src, nn_parameterid_t pid);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#define Q_THREAD_H
|
||||
|
||||
#include "os/os.h"
|
||||
#include "ddsc/dds_export.h"
|
||||
#include "ddsi/q_static_assert.h"
|
||||
|
||||
#if defined (__cplusplus)
|
||||
|
|
@ -81,43 +82,43 @@ struct thread_states {
|
|||
struct thread_state1 *ts; /* [nthreads] */
|
||||
};
|
||||
|
||||
extern struct thread_states thread_states;
|
||||
extern DDS_EXPORT struct thread_states thread_states;
|
||||
extern os_threadLocal struct thread_state1 *tsd_thread_state;
|
||||
|
||||
void thread_states_init_static (void);
|
||||
void thread_states_init (_In_ unsigned maxthreads);
|
||||
void thread_states_fini (void);
|
||||
DDS_EXPORT void thread_states_init_static (void);
|
||||
DDS_EXPORT void thread_states_init (_In_ unsigned maxthreads);
|
||||
DDS_EXPORT void thread_states_fini (void);
|
||||
|
||||
void upgrade_main_thread (void);
|
||||
void downgrade_main_thread (void);
|
||||
const struct config_thread_properties_listelem *lookup_thread_properties (_In_z_ const char *name);
|
||||
_Success_(return != NULL) _Ret_maybenull_ struct thread_state1 *create_thread (_In_z_ const char *name, _In_ uint32_t (*f) (void *arg), _In_opt_ void *arg);
|
||||
_Ret_valid_ struct thread_state1 *lookup_thread_state (void);
|
||||
_Success_(return != NULL) _Ret_maybenull_ struct thread_state1 *lookup_thread_state_real (void);
|
||||
_Success_(return == 0) int join_thread (_Inout_ struct thread_state1 *ts1);
|
||||
void log_stack_traces (void);
|
||||
struct thread_state1 *get_thread_state (_In_ os_threadId id);
|
||||
struct thread_state1 * init_thread_state (_In_z_ const char *tname);
|
||||
void reset_thread_state (_Inout_opt_ struct thread_state1 *ts1);
|
||||
int thread_exists (_In_z_ const char *name);
|
||||
DDS_EXPORT void upgrade_main_thread (void);
|
||||
DDS_EXPORT void downgrade_main_thread (void);
|
||||
DDS_EXPORT const struct config_thread_properties_listelem *lookup_thread_properties (const char *name);
|
||||
DDS_EXPORT struct thread_state1 *create_thread (const char *name, uint32_t (*f) (void *arg), void *arg);
|
||||
DDS_EXPORT struct thread_state1 *lookup_thread_state (void);
|
||||
DDS_EXPORT struct thread_state1 *lookup_thread_state_real (void);
|
||||
DDS_EXPORT int join_thread (_Inout_ struct thread_state1 *ts1);
|
||||
DDS_EXPORT void log_stack_traces (void);
|
||||
DDS_EXPORT struct thread_state1 *get_thread_state (_In_ os_threadId id);
|
||||
DDS_EXPORT struct thread_state1 * init_thread_state (_In_z_ const char *tname);
|
||||
DDS_EXPORT void reset_thread_state (_Inout_opt_ struct thread_state1 *ts1);
|
||||
DDS_EXPORT int thread_exists (_In_z_ const char *name);
|
||||
|
||||
inline int vtime_awake_p (_In_ vtime_t vtime)
|
||||
DDS_EXPORT inline int vtime_awake_p (_In_ vtime_t vtime)
|
||||
{
|
||||
return (vtime % 2) == 0;
|
||||
}
|
||||
|
||||
inline int vtime_asleep_p (_In_ vtime_t vtime)
|
||||
DDS_EXPORT inline int vtime_asleep_p (_In_ vtime_t vtime)
|
||||
{
|
||||
return (vtime % 2) == 1;
|
||||
}
|
||||
|
||||
inline int vtime_gt (_In_ vtime_t vtime1, _In_ vtime_t vtime0)
|
||||
DDS_EXPORT inline int vtime_gt (_In_ vtime_t vtime1, _In_ vtime_t vtime0)
|
||||
{
|
||||
Q_STATIC_ASSERT_CODE (sizeof (vtime_t) == sizeof (svtime_t));
|
||||
return (svtime_t) (vtime1 - vtime0) > 0;
|
||||
}
|
||||
|
||||
inline void thread_state_asleep (_Inout_ struct thread_state1 *ts1)
|
||||
DDS_EXPORT inline void thread_state_asleep (_Inout_ struct thread_state1 *ts1)
|
||||
{
|
||||
vtime_t vt = ts1->vtime;
|
||||
vtime_t wd = ts1->watchdog;
|
||||
|
|
@ -138,9 +139,9 @@ inline void thread_state_asleep (_Inout_ struct thread_state1 *ts1)
|
|||
} else {
|
||||
ts1->watchdog = wd + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void thread_state_awake (_Inout_ struct thread_state1 *ts1)
|
||||
DDS_EXPORT inline void thread_state_awake (_Inout_ struct thread_state1 *ts1)
|
||||
{
|
||||
vtime_t vt = ts1->vtime;
|
||||
vtime_t wd = ts1->watchdog;
|
||||
|
|
@ -158,10 +159,9 @@ inline void thread_state_awake (_Inout_ struct thread_state1 *ts1)
|
|||
} else {
|
||||
ts1->watchdog = wd + 2;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline void thread_state_blocked (_Inout_ struct thread_state1 *ts1)
|
||||
DDS_EXPORT inline void thread_state_blocked (_Inout_ struct thread_state1 *ts1)
|
||||
{
|
||||
vtime_t wd = ts1->watchdog;
|
||||
if ( wd % 2 ){
|
||||
|
|
@ -171,7 +171,7 @@ inline void thread_state_blocked (_Inout_ struct thread_state1 *ts1)
|
|||
}
|
||||
}
|
||||
|
||||
inline void thread_state_unblocked (_Inout_ struct thread_state1 *ts1)
|
||||
DDS_EXPORT inline void thread_state_unblocked (_Inout_ struct thread_state1 *ts1)
|
||||
{
|
||||
vtime_t wd = ts1->watchdog;
|
||||
if ( wd % 2 ){
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#define NN_TIME_H
|
||||
|
||||
#include "os/os.h"
|
||||
#include "ddsc/dds_export.h"
|
||||
|
||||
#if defined (__cplusplus)
|
||||
extern "C" {
|
||||
|
|
@ -55,21 +56,21 @@ extern const nn_duration_t duration_infinite;
|
|||
|
||||
int valid_ddsi_timestamp (nn_ddsi_time_t t);
|
||||
|
||||
OSAPI_EXPORT nn_wctime_t now (void); /* wall clock time */
|
||||
nn_mtime_t now_mt (void); /* monotonic time */
|
||||
nn_etime_t now_et (void); /* elapsed time */
|
||||
void mtime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_mtime_t t);
|
||||
void wctime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_wctime_t t);
|
||||
void etime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_etime_t t);
|
||||
nn_mtime_t mtime_round_up (nn_mtime_t t, int64_t round);
|
||||
nn_mtime_t add_duration_to_mtime (nn_mtime_t t, int64_t d);
|
||||
nn_wctime_t add_duration_to_wctime (nn_wctime_t t, int64_t d);
|
||||
nn_etime_t add_duration_to_etime (nn_etime_t t, int64_t d);
|
||||
DDS_EXPORT nn_wctime_t now (void); /* wall clock time */
|
||||
DDS_EXPORT nn_mtime_t now_mt (void); /* monotonic time */
|
||||
DDS_EXPORT nn_etime_t now_et (void); /* elapsed time */
|
||||
DDS_EXPORT void mtime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_mtime_t t);
|
||||
DDS_EXPORT void wctime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_wctime_t t);
|
||||
DDS_EXPORT void etime_to_sec_usec (_Out_ int * __restrict sec, _Out_ int * __restrict usec, _In_ nn_etime_t t);
|
||||
DDS_EXPORT nn_mtime_t mtime_round_up (nn_mtime_t t, int64_t round);
|
||||
DDS_EXPORT nn_mtime_t add_duration_to_mtime (nn_mtime_t t, int64_t d);
|
||||
DDS_EXPORT nn_wctime_t add_duration_to_wctime (nn_wctime_t t, int64_t d);
|
||||
DDS_EXPORT nn_etime_t add_duration_to_etime (nn_etime_t t, int64_t d);
|
||||
|
||||
nn_ddsi_time_t nn_wctime_to_ddsi_time (nn_wctime_t t);
|
||||
OSAPI_EXPORT nn_wctime_t nn_wctime_from_ddsi_time (nn_ddsi_time_t x);
|
||||
OSAPI_EXPORT nn_duration_t nn_to_ddsi_duration (int64_t t);
|
||||
OSAPI_EXPORT int64_t nn_from_ddsi_duration (nn_duration_t x);
|
||||
DDS_EXPORT nn_ddsi_time_t nn_wctime_to_ddsi_time (nn_wctime_t t);
|
||||
DDS_EXPORT nn_wctime_t nn_wctime_from_ddsi_time (nn_ddsi_time_t x);
|
||||
DDS_EXPORT nn_duration_t nn_to_ddsi_duration (int64_t t);
|
||||
DDS_EXPORT int64_t nn_from_ddsi_duration (nn_duration_t x);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,31 +41,31 @@ struct xeventq *xeventq_new
|
|||
|
||||
/* xeventq_free calls callback handlers with t = T_NEVER, at which point they are required to free
|
||||
whatever memory is claimed for the argument and call delete_xevent. */
|
||||
void xeventq_free (struct xeventq *evq);
|
||||
int xeventq_start (struct xeventq *evq, const char *name); /* <0 => error, =0 => ok */
|
||||
void xeventq_stop (struct xeventq *evq);
|
||||
DDS_EXPORT void xeventq_free (struct xeventq *evq);
|
||||
DDS_EXPORT int xeventq_start (struct xeventq *evq, const char *name); /* <0 => error, =0 => ok */
|
||||
DDS_EXPORT void xeventq_stop (struct xeventq *evq);
|
||||
|
||||
void qxev_msg (struct xeventq *evq, struct nn_xmsg *msg);
|
||||
void qxev_pwr_entityid (struct proxy_writer * pwr, nn_guid_prefix_t * id);
|
||||
void qxev_prd_entityid (struct proxy_reader * prd, nn_guid_prefix_t * id);
|
||||
DDS_EXPORT void qxev_msg (struct xeventq *evq, struct nn_xmsg *msg);
|
||||
DDS_EXPORT void qxev_pwr_entityid (struct proxy_writer * pwr, nn_guid_prefix_t * id);
|
||||
DDS_EXPORT void qxev_prd_entityid (struct proxy_reader * prd, nn_guid_prefix_t * id);
|
||||
|
||||
/* Returns 1 if queued, 0 otherwise (no point in returning the
|
||||
event, you can't do anything with it anyway) */
|
||||
int qxev_msg_rexmit_wrlock_held (struct xeventq *evq, struct nn_xmsg *msg, int force);
|
||||
DDS_EXPORT int qxev_msg_rexmit_wrlock_held (struct xeventq *evq, struct nn_xmsg *msg, int force);
|
||||
|
||||
/* All of the following lock EVQ for the duration of the operation */
|
||||
void delete_xevent (struct xevent *ev);
|
||||
int resched_xevent_if_earlier (struct xevent *ev, nn_mtime_t tsched);
|
||||
DDS_EXPORT void delete_xevent (struct xevent *ev);
|
||||
DDS_EXPORT int resched_xevent_if_earlier (struct xevent *ev, nn_mtime_t tsched);
|
||||
|
||||
struct xevent *qxev_heartbeat (struct xeventq *evq, nn_mtime_t tsched, const nn_guid_t *wr_guid);
|
||||
struct xevent *qxev_acknack (struct xeventq *evq, nn_mtime_t tsched, const nn_guid_t *pwr_guid, const nn_guid_t *rd_guid);
|
||||
struct xevent *qxev_spdp (nn_mtime_t tsched, const nn_guid_t *pp_guid, const nn_guid_t *proxypp_guid);
|
||||
struct xevent *qxev_pmd_update (nn_mtime_t tsched, const nn_guid_t *pp_guid);
|
||||
struct xevent *qxev_end_startup_mode (nn_mtime_t tsched);
|
||||
struct xevent *qxev_delete_writer (nn_mtime_t tsched, const nn_guid_t *guid);
|
||||
DDS_EXPORT struct xevent *qxev_heartbeat (struct xeventq *evq, nn_mtime_t tsched, const nn_guid_t *wr_guid);
|
||||
DDS_EXPORT struct xevent *qxev_acknack (struct xeventq *evq, nn_mtime_t tsched, const nn_guid_t *pwr_guid, const nn_guid_t *rd_guid);
|
||||
DDS_EXPORT struct xevent *qxev_spdp (nn_mtime_t tsched, const nn_guid_t *pp_guid, const nn_guid_t *proxypp_guid);
|
||||
DDS_EXPORT struct xevent *qxev_pmd_update (nn_mtime_t tsched, const nn_guid_t *pp_guid);
|
||||
DDS_EXPORT struct xevent *qxev_end_startup_mode (nn_mtime_t tsched);
|
||||
DDS_EXPORT struct xevent *qxev_delete_writer (nn_mtime_t tsched, const nn_guid_t *guid);
|
||||
|
||||
/* cb will be called with now = T_NEVER if the event is still enqueued when when xeventq_free starts cleaning up */
|
||||
struct xevent *qxev_callback (nn_mtime_t tsched, void (*cb) (struct xevent *xev, void *arg, nn_mtime_t now), void *arg);
|
||||
DDS_EXPORT struct xevent *qxev_callback (nn_mtime_t tsched, void (*cb) (struct xevent *xev, void *arg, nn_mtime_t now), void *arg);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -326,21 +326,21 @@ typedef struct nn_xqos {
|
|||
|
||||
struct nn_xmsg;
|
||||
|
||||
void nn_xqos_init_empty (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_reader (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_writer (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_writer_noautodispose (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_subscriber (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_publisher (nn_xqos_t *xqos);
|
||||
void nn_xqos_init_default_topic (nn_xqos_t *xqos);
|
||||
void nn_xqos_copy (nn_xqos_t *dst, const nn_xqos_t *src);
|
||||
void nn_xqos_unalias (nn_xqos_t *xqos);
|
||||
void nn_xqos_fini (nn_xqos_t *xqos);
|
||||
void nn_xqos_mergein_missing (nn_xqos_t *a, const nn_xqos_t *b);
|
||||
uint64_t nn_xqos_delta (const nn_xqos_t *a, const nn_xqos_t *b, uint64_t mask);
|
||||
void nn_xqos_addtomsg (struct nn_xmsg *m, const nn_xqos_t *xqos, uint64_t wanted);
|
||||
void nn_log_xqos (uint32_t cat, const nn_xqos_t *xqos);
|
||||
nn_xqos_t *nn_xqos_dup (const nn_xqos_t *src);
|
||||
DDS_EXPORT void nn_xqos_init_empty (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_reader (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_writer (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_writer_noautodispose (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_subscriber (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_publisher (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_init_default_topic (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_copy (nn_xqos_t *dst, const nn_xqos_t *src);
|
||||
DDS_EXPORT void nn_xqos_unalias (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_fini (nn_xqos_t *xqos);
|
||||
DDS_EXPORT void nn_xqos_mergein_missing (nn_xqos_t *a, const nn_xqos_t *b);
|
||||
DDS_EXPORT uint64_t nn_xqos_delta (const nn_xqos_t *a, const nn_xqos_t *b, uint64_t mask);
|
||||
DDS_EXPORT void nn_xqos_addtomsg (struct nn_xmsg *m, const nn_xqos_t *xqos, uint64_t wanted);
|
||||
DDS_EXPORT void nn_log_xqos (uint32_t cat, const nn_xqos_t *xqos);
|
||||
DDS_EXPORT nn_xqos_t *nn_xqos_dup (const nn_xqos_t *src);
|
||||
|
||||
#if defined (__cplusplus)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#include "ddsi/q_xqos.h"
|
||||
#include "ddsi/ddsi_rhc_plugin.h"
|
||||
|
||||
void make_proxy_writer_info(struct proxy_writer_info *pwr_info, const struct entity_common *e, const struct nn_xqos *xqos)
|
||||
DDS_EXPORT void make_proxy_writer_info(struct proxy_writer_info *pwr_info, const struct entity_common *e, const struct nn_xqos *xqos)
|
||||
{
|
||||
pwr_info->guid = e->guid;
|
||||
pwr_info->ownership_strength = xqos->ownership_strength.value;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue