There have been crashes and general instability seen in the pubsub code, so this patch introduces three changes to increase the stability. First, the ownership model for subscriptions has been modified. Due to RLS, subscriptions are stored in memory as a tree structure. Prior to my patch, the PJSIP subscription was the owner of the subscription tree. When the PJSIP subscription told us that it was terminating, we started destroying the subscription tree along with all of the individual leaf subscriptions that belong to the tree. The problem with this model is that the two actors in play here, the PJSIP subscription and the individual leaf subscriptions, need to have joint ownership of the subscription tree. So now, the PJSIP subscription and the individual leaf subscriptions each have a reference to the subscription tree. This way, we will not actually free memory until no players are left that care. The PJSIP subscription is a bigger stakeholder, in that if the PJSIP subscription's reference to the subscription tree is removed, the subscription tree instructs the leaf subscriptions to shut down and drop their references to the subscription tree when possible. The individual leaf subscriptions, upon being told to shut down, can drop their stasis subscriptions or whatever they use to learn of new state, and then drop their reference to the subscription tree once they are ready to die. Second, the lifetime of a PJSIP subscription's reference to our subscription tree has been altered. As I learned from doing a deep dive, the PJSIP evsub code can tell Asterisk multiple times that the subscription has been terminated, and not all of these times are especially helpful. I have altered the message flow that we use for SIP subscriptions such that we will always drop the PJSIP subscription's reference to the subscription tree when we send the NOTIFY that terminates a SIP subscription. This also means that we will now queue NOTIFY requests to be sent after responding to incoming SUBSCRIBEs so that we can have predictable state changes from the PJSIP evsub code. Third, the synchronization of operations has been improved. PJSIP can call into our code from a serializer thread (e.g. upon receiving an incoming request) or from the monitor thread (e.g. when a subscription times out). Because of this, there is the possibility of competing threads stepping on each other. PJSIP attempts to do some synchronization on its own by always keeping the dialog lock held when it calls into us. However, since we end up pushing tasks into the serializer, the result was that serialized operations were not grabbing the dialog lock and could, as a result, step on something that was being attempted by a different thread. Now we ensure that serialized operations grab the dialog lock, then check for extenuating circumstances, then proceed with their operation if they can. Change-Id: Iff2990c40178dad9cc5f6a5c7f76932ec644b2e5
45 lines
2.2 KiB
Text
45 lines
2.2 KiB
Text
{
|
|
global:
|
|
LINKER_SYMBOL_PREFIXast_sip_create_subscription;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_endpoint;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_serializer;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_evsub;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_dlg;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_accept;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_send_request;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_alloc_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_add_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_remove_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_register_subscription_handler;
|
|
LINKER_SYMBOL_PREFIXast_sip_unregister_subscription_handler;
|
|
LINKER_SYMBOL_PREFIXast_sip_create_publication;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_get_endpoint;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_get_resource;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_get_event_configuration;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_create_response;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_send_response;
|
|
LINKER_SYMBOL_PREFIXast_sip_register_publish_handler;
|
|
LINKER_SYMBOL_PREFIXast_sip_unregister_publish_handler;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_add_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_get_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_remove_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_publication_remove_datastore;
|
|
LINKER_SYMBOL_PREFIXast_sip_pubsub_register_body_generator;
|
|
LINKER_SYMBOL_PREFIXast_sip_pubsub_unregister_body_generator;
|
|
LINKER_SYMBOL_PREFIXast_sip_pubsub_register_body_supplement;
|
|
LINKER_SYMBOL_PREFIXast_sip_pubsub_unregister_body_supplement;
|
|
LINKER_SYMBOL_PREFIXast_sip_pubsub_generate_body_content;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_body_type;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_body_subtype;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_resource_name;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_notify;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_local_uri;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_remote_uri;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_get_header;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_is_terminated;
|
|
LINKER_SYMBOL_PREFIXast_sip_subscription_destroy;
|
|
local:
|
|
*;
|
|
};
|