SWIFT-1419 Vendor libmongoc 1.21.0 (#732)

Author: kmahar

Sources/CLibMongoC/bson/bson-atomic.c

@@ -195,8 +195,8 @@ _bson_emul_atomic_int32_compare_exchange_weak (volatile int32_t *p,
 
 int
 _bson_emul_atomic_int_fetch_add (volatile int *p,
-                                   int n,
-                                   enum bson_memory_order _unused)
+                                 int n,
+                                 enum bson_memory_order _unused)
 {
    int ret;
    _lock_emul_atomic ();
@@ -208,8 +208,8 @@ _bson_emul_atomic_int_fetch_add (volatile int *p,
 
 int
 _bson_emul_atomic_int_exchange (volatile int *p,
-                                  int n,
-                                  enum bson_memory_order _unused)
+                                int n,
+                                enum bson_memory_order _unused)
 {
    int ret;
    _lock_emul_atomic ();
@@ -221,9 +221,9 @@ _bson_emul_atomic_int_exchange (volatile int *p,
 
 int
 _bson_emul_atomic_int_compare_exchange_strong (volatile int *p,
-                                                 int expect_value,
-                                                 int new_value,
-                                                 enum bson_memory_order _unused)
+                                               int expect_value,
+                                               int new_value,
+                                               enum bson_memory_order _unused)
 {
    int ret;
    _lock_emul_atomic ();
@@ -237,11 +237,24 @@ _bson_emul_atomic_int_compare_exchange_strong (volatile int *p,
 
 int
 _bson_emul_atomic_int_compare_exchange_weak (volatile int *p,
-                                               int expect_value,
-                                               int new_value,
-                                               enum bson_memory_order order)
+                                             int expect_value,
+                                             int new_value,
+                                             enum bson_memory_order order)
 {
    /* We're emulating. We can't do a weak version. */
    return _bson_emul_atomic_int_compare_exchange_strong (
       p, expect_value, new_value, order);
 }
+
+void *
+_bson_emul_atomic_ptr_exchange (void *volatile *p,
+                                void *n,
+                                enum bson_memory_order _unused)
+{
+   void *ret;
+   _lock_emul_atomic ();
+   ret = *p;
+   *p = n;
+   _unlock_emul_atomic ();
+   return ret;
+}

Sources/CLibMongoC/bson/bson-context-private.h

@@ -28,24 +28,55 @@
 BSON_BEGIN_DECLS
 
 
+enum {
+   BSON_OID_RANDOMESS_OFFSET = 4,
+   BSON_OID_RANDOMNESS_SIZE = 5,
+   BSON_OID_SEQ32_OFFSET = 9,
+   BSON_OID_SEQ32_SIZE = 3,
+   BSON_OID_SEQ64_OFFSET = 4,
+   BSON_OID_SEQ64_SIZE = 8
+};
+
 struct _bson_context_t {
    /* flags are defined in bson_context_flags_t */
    int flags;
-   int32_t seq32;
-   int64_t seq64;
-   uint8_t rand[5];
-   uint16_t pid;
-
-   void (*oid_set_seq32) (bson_context_t *context, bson_oid_t *oid);
-   void (*oid_set_seq64) (bson_context_t *context, bson_oid_t *oid);
-
-   /* this function pointer allows us to mock gethostname for testing. */
-   void (*gethostname) (char *out);
+   uint32_t seq32;
+   uint64_t seq64;
+   uint8_t randomness[BSON_OID_RANDOMNESS_SIZE];
+   uint64_t pid;
 };
 
+/**
+ * @brief Insert the context's randomness data into the given OID
+ *
+ * @param context A context for some random data
+ * @param oid The OID to update.
+ */
 void
 _bson_context_set_oid_rand (bson_context_t *context, bson_oid_t *oid);
 
+/**
+ * @brief Insert the context's sequence counter into the given OID. Increments
+ * the context's sequence counter.
+ *
+ * @param context The context with the counter to get+update
+ * @param oid The OID to modify
+ */
+void
+_bson_context_set_oid_seq32 (bson_context_t *context, bson_oid_t *oid);
+
+/**
+ * @brief Write a 64-bit counter from the given context into the OID. Increments
+ * the context's sequence counter.
+ *
+ * @param context The context with the counter to get+update
+ * @param oid The OID to modify
+ *
+ * @note Only used by the deprecated @ref bson_oid_init_sequence
+ */
+void
+_bson_context_set_oid_seq64 (bson_context_t *context, bson_oid_t *oid);
+
 
 BSON_END_DECLS