Changeset 4420 for pjproject/trunk/pjsip/include/pjsip/sip_transaction.h

Timestamp:

Mar 5, 2013 11:59:54 AM (12 years ago)

Author:

bennylp

Message:

Implementation of Re #1628: Modify SIP transaction to use group lock to avoid deadlock etc.

File:

• pjproject/trunk/pjsip/include/pjsip/sip_transaction.h (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transaction.h

@@ -86 +86 @@
     pjsip_module               *tsx_user;       /**< Transaction user.      */
     pjsip_endpoint             *endpt;          /**< Endpoint instance.     */
-    pj_mutex_t                 *mutex;          /**< Mutex for this tsx.    */
+    pj_bool_t                   terminating;    /**< terminate() was called */
+    pj_grp_lock_t              *grp_lock;       /**< Transaction grp lock.  */
     pj_mutex_t                 *mutex_b;        /**< Second mutex to avoid
                                                      deadlock. It is used to
@@ -214 +215 @@
 
 /**
+ * Variant of pjsip_tsx_create_uac() with additional parameter to specify
+ * the group lock to use. Group lock can be used to synchronize locking
+ * among several objects to prevent deadlock, and to synchronize the
+ * lifetime of objects sharing the same group lock.
+ *
+ * See pjsip_tsx_create_uac() for general info about this function.
+ *
+ * @param tsx_user  Module to be registered as transaction user of the new
+ *                  transaction, which will receive notification from the
+ *                  transaction via on_tsx_state() callback.
+ * @param tdata     The outgoing request message.
+ * @param grp_lock  Optional group lock to use by this transaction. If
+ *                  the value is NULL, the transaction will create its
+ *                  own group lock.
+ * @param p_tsx     On return will contain the new transaction instance.
+ *
+ * @return          PJ_SUCCESS if successfull.
+ */
+PJ_DECL(pj_status_t) pjsip_tsx_create_uac2(pjsip_module *tsx_user,
+                                           pjsip_tx_data *tdata,
+                                           pj_grp_lock_t *grp_lock,
+                                           pjsip_transaction **p_tsx);
+
+/**
  * Create, initialize, and register a new transaction as UAS from the
  * specified incoming request in \c rdata. After calling this function,
@@ -231 +256 @@
                                            pjsip_transaction **p_tsx );
 
+/**
+ * Variant of pjsip_tsx_create_uas() with additional parameter to specify
+ * the group lock to use. Group lock can be used to synchronize locking
+ * among several objects to prevent deadlock, and to synchronize the
+ * lifetime of objects sharing the same group lock.
+ *
+ * See pjsip_tsx_create_uas() for general info about this function.
+ *
+ * @param tsx_user  Module to be registered as transaction user of the new
+ *                  transaction, which will receive notification from the
+ *                  transaction via on_tsx_state() callback.
+ * @param rdata     The received incoming request.
+ * @param grp_lock  Optional group lock to use by this transaction. If
+ *                  the value is NULL, the transaction will create its
+ *                  own group lock.
+ * @param p_tsx     On return will contain the new transaction instance.
+ *
+ * @return          PJ_SUCCESS if successfull.
+ */
+PJ_DECL(pj_status_t) pjsip_tsx_create_uas2(pjsip_module *tsx_user,
+                                           pjsip_rx_data *rdata,
+                                           pj_grp_lock_t *grp_lock,
+                                           pjsip_transaction **p_tsx );
 
 /**