Some scheduler API cleanup and improvements.

Previously, I had added the ast_sched_thread stuff that was a generic scheduler
thread implementation.  However, if you used it, it required using different
functions for modifying scheduler contents.  This patch reworks how this is
done and just allows you to optionally start a thread on the original scheduler
context structure that has always been there.  This makes it trivial to switch
to the generic scheduler thread implementation without having to touch any of
the other code that adds or removes scheduler entries.

In passing, I made some naming tweaks to add ast_ prefixes where they were not
there before.

Review: https://reviewboard.asterisk.org/r/1007/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

10 files changed, 90 insertions, 81 deletions

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 9b7dd80af..280cac4b5 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -226,7 +226,7 @@ static const struct ast_channel_tech gtalk_tech = {
 
 static struct sockaddr_in bindaddr = { 0, };	/*!< The address we bind to */
 
-static struct sched_context *sched;	/*!< The scheduling context */
+static struct ast_sched_context *sched;	/*!< The scheduling context */
 static struct io_context *io;	/*!< The IO context */
 static struct in_addr __ourip;
 
@@ -2248,7 +2248,7 @@ static int load_module(void)
 		return 0;
 	}
 
-	sched = sched_context_create();
+	sched = ast_sched_context_create();
 	if (!sched) {
 		ast_log(LOG_WARNING, "Unable to create schedule context\n");
 	}
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 89b452dbc..e549d4299 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -205,7 +205,7 @@ static struct h323_alias_list {
 } aliasl;
 
 /* Asterisk RTP stuff */
-static struct sched_context *sched;
+static struct ast_sched_context *sched;
 static struct io_context *io;
 
 AST_MUTEX_DEFINE_STATIC(iflock);	/*!< Protect the interface list (oh323_pvt) */
@@ -3261,7 +3261,7 @@ static enum ast_module_load_result load_module(void)
 	int res;
 
 	h323debug = 0;
-	sched = sched_context_create();
+	sched = ast_sched_context_create();
 	if (!sched) {
 		ast_log(LOG_WARNING, "Unable to create schedule context\n");
 		return AST_MODULE_LOAD_FAILURE;
@@ -3282,7 +3282,7 @@ static enum ast_module_load_result load_module(void)
 		ast_cli_unregister(&cli_h323_reload);
 		io_context_destroy(io);
 		io = NULL;
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 		sched = NULL;
 		ASTOBJ_CONTAINER_DESTROY(&userl);
 		ASTOBJ_CONTAINER_DESTROY(&peerl);
@@ -3295,7 +3295,7 @@ static enum ast_module_load_result load_module(void)
 			ast_cli_unregister(&cli_h323_reload);
 			h323_end_process();
 			io_context_destroy(io);
-			sched_context_destroy(sched);
+			ast_sched_context_destroy(sched);
 
 			ASTOBJ_CONTAINER_DESTROYALL(&userl, oh323_destroy_user);
 			ASTOBJ_CONTAINER_DESTROY(&userl);
@@ -3334,7 +3334,7 @@ static enum ast_module_load_result load_module(void)
 			ast_cli_unregister(&cli_h323_reload);
 			h323_end_process();
 			io_context_destroy(io);
-			sched_context_destroy(sched);
+			ast_sched_context_destroy(sched);
 
 			ASTOBJ_CONTAINER_DESTROYALL(&userl, oh323_destroy_user);
 			ASTOBJ_CONTAINER_DESTROY(&userl);
@@ -3421,7 +3421,7 @@ static int unload_module(void)
 	if (io)
 		io_context_destroy(io);
 	if (sched)
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 
 	ASTOBJ_CONTAINER_DESTROYALL(&userl, oh323_destroy_user);
 	ASTOBJ_CONTAINER_DESTROY(&userl);
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index abd158c01..a6d716b3c 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -356,8 +356,8 @@ static int (*iax2_regfunk)(const char *username, int onoff) = NULL;
 		ast_log(LOG_NOTICE, msg " IAX_COMMAND_RTKEY to rotate key to '%s'\n", digest); \
 	} while(0)
 
-static	struct io_context *io;
-static	struct ast_sched_thread *sched;
+static struct io_context *io;
+static struct ast_sched_context *sched;
 
 #define DONT_RESCHEDULE -2
 
@@ -1183,7 +1183,7 @@ static int iax2_setoption(struct ast_channel *c, int option, void *data, int dat
 static int iax2_queryoption(struct ast_channel *c, int option, void *data, int *datalen);
 static int iax2_transfer(struct ast_channel *c, const char *dest);
 static int iax2_write(struct ast_channel *c, struct ast_frame *f);
-static int iax2_sched_add(struct ast_sched_thread *st, int when, ast_sched_cb callback, const void *data);
+static int iax2_sched_add(struct ast_sched_context *sched, int when, ast_sched_cb callback, const void *data);
 
 static int send_trunk(struct iax2_trunk_peer *tpeer, struct timeval *now);
 static int send_command(struct chan_iax2_pvt *, char, int, unsigned int, const unsigned char *, int, int);
@@ -1487,18 +1487,16 @@ static int __schedule_action(void (*func)(const void *data), const void *data, c
 #define schedule_action(func, data) __schedule_action(func, data, __PRETTY_FUNCTION__)
 #endif
 
-static int iax2_sched_replace(int id, struct ast_sched_thread *st, int when, 
+static int iax2_sched_replace(int id, struct ast_sched_context *con, int when,
 		ast_sched_cb callback, const void *data)
 {
-	ast_sched_thread_del(st, id);
-
-	return ast_sched_thread_add(st, when, callback, data);
+	return ast_sched_replace(id, con, when, callback, data);
 }
 
-static int iax2_sched_add(struct ast_sched_thread *st, int when, 
+static int iax2_sched_add(struct ast_sched_context *con, int when,
 		ast_sched_cb callback, const void *data)
 {
-	return ast_sched_thread_add(st, when, callback, data);
+	return ast_sched_add(con, when, callback, data);
 }
 
 static int send_ping(const void *data);
@@ -1787,20 +1785,20 @@ static void iax2_destroy_helper(struct chan_iax2_pvt *pvt)
 		ast_clear_flag64(pvt, IAX_MAXAUTHREQ);
 	}
 	/* No more pings or lagrq's */
-	AST_SCHED_DEL_SPINLOCK(ast_sched_thread_get_context(sched), pvt->pingid, &iaxsl[pvt->callno]);
+	AST_SCHED_DEL_SPINLOCK(sched, pvt->pingid, &iaxsl[pvt->callno]);
 	pvt->pingid = DONT_RESCHEDULE;
-	AST_SCHED_DEL_SPINLOCK(ast_sched_thread_get_context(sched), pvt->lagid, &iaxsl[pvt->callno]);
+	AST_SCHED_DEL_SPINLOCK(sched, pvt->lagid, &iaxsl[pvt->callno]);
 	pvt->lagid = DONT_RESCHEDULE;
-	ast_sched_thread_del(sched, pvt->autoid);
-	ast_sched_thread_del(sched, pvt->authid);
-	ast_sched_thread_del(sched, pvt->initid);
-	ast_sched_thread_del(sched, pvt->jbid);
-	ast_sched_thread_del(sched, pvt->keyrotateid);
+	AST_SCHED_DEL(sched, pvt->autoid);
+	AST_SCHED_DEL(sched, pvt->authid);
+	AST_SCHED_DEL(sched, pvt->initid);
+	AST_SCHED_DEL(sched, pvt->jbid);
+	AST_SCHED_DEL(sched, pvt->keyrotateid);
 }
 
 static void iax2_frame_free(struct iax_frame *fr)
 {
-	ast_sched_thread_del(sched, fr->retrans);
+	AST_SCHED_DEL(sched, fr->retrans);
 	iax_frame_free(fr);
 }
 
@@ -2058,8 +2056,8 @@ static int make_trunk(unsigned short callno, int locked)
 	 * \note We delete these before switching the slot, because if
 	 * they fire in the meantime, they will generate a warning.
 	 */
-	ast_sched_thread_del(sched, iaxs[callno]->pingid);
-	ast_sched_thread_del(sched, iaxs[callno]->lagid);
+	AST_SCHED_DEL(sched, iaxs[callno]->pingid);
+	AST_SCHED_DEL(sched, iaxs[callno]->lagid);
 	iaxs[callno]->lagid = iaxs[callno]->pingid = -1;
 	iaxs[x] = iaxs[callno];
 	iaxs[x]->callno = x;
@@ -4194,7 +4192,7 @@ static int schedule_delivery(struct iax_frame *fr, int updatehistory, int fromtr
 
 		jb_reset(iaxs[fr->callno]->jb);
 
-		ast_sched_thread_del(sched, iaxs[fr->callno]->jbid);
+		AST_SCHED_DEL(sched, iaxs[fr->callno]->jbid);
 
 		/* deliver this frame now */
 		if (tsout)
@@ -4389,7 +4387,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 		ast_copy_flags64(peer, &globalflags, IAX_RTAUTOCLEAR|IAX_RTCACHEFRIENDS);
 		if (ast_test_flag64(peer, IAX_RTAUTOCLEAR)) {
 			if (peer->expire > -1) {
-				if (!ast_sched_thread_del(sched, peer->expire)) {
+				if (!AST_SCHED_DEL(sched, peer->expire)) {
 					peer->expire = -1;
 					peer_unref(peer);
 				}
@@ -5217,7 +5215,7 @@ static int iax2_hangup(struct ast_channel *c)
 			ast_debug(1, "Really destroying %s now...\n", c->name);
 			iax2_destroy(callno);
 		} else if (iaxs[callno]) {
-			if (ast_sched_thread_add(sched, 10000, scheduled_destroy, CALLNO_TO_PTR(callno)) < 0) {
+			if (ast_sched_add(sched, 10000, scheduled_destroy, CALLNO_TO_PTR(callno)) < 0) {
 				ast_log(LOG_ERROR, "Unable to schedule iax2 callno %d destruction?!!  Destroying immediately.\n", callno);
 				iax2_destroy(callno);
 			}
@@ -5348,12 +5346,11 @@ static int iax2_key_rotate(const void *vpvt)
 	struct MD5Context md5;
 	char key[17] = "";
 	struct iax_ie_data ied = {
-		.pos = 0,	
+		.pos = 0,
 	};
-	
+
 	ast_mutex_lock(&iaxsl[pvt->callno]);
-	pvt->keyrotateid = 
-		ast_sched_thread_add(sched, 120000 + (ast_random() % 180001), iax2_key_rotate, vpvt);
+	pvt->keyrotateid = ast_sched_add(sched, 120000 + (ast_random() % 180001), iax2_key_rotate, vpvt);
 
 	snprintf(key, sizeof(key), "%lX", ast_random());
 
@@ -8543,14 +8540,14 @@ static void prune_peers(void);
 static void unlink_peer(struct iax2_peer *peer)
 {
 	if (peer->expire > -1) {
-		if (!ast_sched_thread_del(sched, peer->expire)) {
+		if (!AST_SCHED_DEL(sched, peer->expire)) {
 			peer->expire = -1;
 			peer_unref(peer);
 		}
 	}
 
 	if (peer->pokeexpire > -1) {
-		if (!ast_sched_thread_del(sched, peer->pokeexpire)) {
+		if (!AST_SCHED_DEL(sched, peer->pokeexpire)) {
 			peer->pokeexpire = -1;
 			peer_unref(peer);
 		}
@@ -8629,7 +8626,7 @@ static void reg_source_db(struct iax2_peer *p)
 
 	iax2_poke_peer(p, 0);
 	if (p->expire > -1) {
-		if (!ast_sched_thread_del(sched, p->expire)) {
+		if (!AST_SCHED_DEL(sched, p->expire)) {
 			p->expire = -1;
 			peer_unref(p);
 		}
@@ -8741,7 +8738,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
 	p->sockfd = fd;
 	/* Setup the expiry */
 	if (p->expire > -1) {
-		if (!ast_sched_thread_del(sched, p->expire)) {
+		if (!AST_SCHED_DEL(sched, p->expire)) {
 			p->expire = -1;
 			peer_unref(p);
 		}
@@ -10297,7 +10294,7 @@ static int socket_process(struct iax2_thread *thread)
 			}
 		}
 		if (f.frametype == AST_FRAME_IAX) {
-			ast_sched_thread_del(sched, iaxs[fr->callno]->initid);
+			AST_SCHED_DEL(sched, iaxs[fr->callno]->initid);
 			/* Handle the IAX pseudo frame itself */
 			if (iaxdebug)
 				ast_debug(1, "IAX subclass %d received\n", f.subclass.integer);
@@ -10823,7 +10820,7 @@ static int socket_process(struct iax2_thread *thread)
 
 					/* Remove scheduled iax2_poke_noanswer */
 					if (peer->pokeexpire > -1) {
-						if (!ast_sched_thread_del(sched, peer->pokeexpire)) {
+						if (!AST_SCHED_DEL(sched, peer->pokeexpire)) {
 							peer_unref(peer);
 							peer->pokeexpire = -1;
 						}
@@ -11943,22 +11940,22 @@ static int iax2_poke_peer(struct iax2_peer *peer, int heldcall)
 	iaxs[peer->callno]->pingtime = peer->maxms / 4 + 1;
 	iaxs[peer->callno]->peerpoke = peer;
 
- 	if (peer->pokeexpire > -1) {
- 		if (!ast_sched_thread_del(sched, peer->pokeexpire)) {
- 			peer->pokeexpire = -1;
- 			peer_unref(peer);
- 		}
- 	}
- 
+	if (peer->pokeexpire > -1) {
+		if (!AST_SCHED_DEL(sched, peer->pokeexpire)) {
+			peer->pokeexpire = -1;
+			peer_unref(peer);
+		}
+	}
+
 	/* Queue up a new task to handle no reply */
 	/* If the host is already unreachable then use the unreachable interval instead */
 	if (peer->lastms < 0)
- 		peer->pokeexpire = iax2_sched_add(sched, peer->pokefreqnotok, iax2_poke_noanswer, peer_ref(peer));
+		peer->pokeexpire = iax2_sched_add(sched, peer->pokefreqnotok, iax2_poke_noanswer, peer_ref(peer));
 	else
- 		peer->pokeexpire = iax2_sched_add(sched, DEFAULT_MAXMS * 2, iax2_poke_noanswer, peer_ref(peer));
+		peer->pokeexpire = iax2_sched_add(sched, DEFAULT_MAXMS * 2, iax2_poke_noanswer, peer_ref(peer));
 
- 	if (peer->pokeexpire == -1)
- 		peer_unref(peer);
+	if (peer->pokeexpire == -1)
+		peer_unref(peer);
 
 	/* And send the poke */
 	ast_mutex_lock(&iaxsl[callno]);
@@ -12391,7 +12388,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
 					}
 				} else {
 					/* Non-dynamic.  Make sure we become that way if we're not */
-					ast_sched_thread_del(sched, peer->expire);
+					AST_SCHED_DEL(sched, peer->expire);
 					ast_clear_flag64(peer, IAX_DYNAMIC);
 					if (ast_dnsmgr_lookup(v->value, &peer->addr, &peer->dnsmgr, srvlookup ? "_iax._udp" : NULL))
 						return peer_unref(peer);
@@ -12835,7 +12832,7 @@ static void delete_users(void)
 	AST_LIST_LOCK(&registrations);
 	while ((reg = AST_LIST_REMOVE_HEAD(&registrations, entry))) {
 		if (sched) {
-			ast_sched_thread_del(sched, reg->expire);
+			AST_SCHED_DEL(sched, reg->expire);
 		}
 		if (reg->callno) {
 			int callno = reg->callno;
@@ -14269,7 +14266,8 @@ static int __unload_module(void)
 		ast_timer_close(timer);
 	}
 	transmit_processor = ast_taskprocessor_unreference(transmit_processor);
-	sched = ast_sched_thread_destroy(sched);
+	ast_sched_context_destroy(sched);
+	sched = NULL;
 
 	con = ast_context_find(regcontext);
 	if (con)
@@ -14588,21 +14586,29 @@ static int load_module(void)
 		ast_mutex_init(&iaxsl[x]);
 	}
 
-	if (!(sched = ast_sched_thread_create())) {
+	if (!(sched = ast_sched_context_create())) {
 		ast_log(LOG_ERROR, "Failed to create scheduler thread\n");
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
+	if (ast_sched_start_thread(sched)) {
+		ast_sched_context_destroy(sched);
+		sched = NULL;
+		return AST_MODULE_LOAD_FAILURE;
+	}
+
 	if (!(io = io_context_create())) {
 		ast_log(LOG_ERROR, "Failed to create I/O context\n");
-		sched = ast_sched_thread_destroy(sched);
+		ast_sched_context_destroy(sched);
+		sched = NULL;
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
 	if (!(netsock = ast_netsock_list_alloc())) {
 		ast_log(LOG_ERROR, "Failed to create netsock list\n");
 		io_context_destroy(io);
-		sched = ast_sched_thread_destroy(sched);
+		ast_sched_context_destroy(sched);
+		sched = NULL;
 		return AST_MODULE_LOAD_FAILURE;
 	}
 	ast_netsock_init(netsock);
@@ -14611,7 +14617,8 @@ static int load_module(void)
 	if (!outsock) {
 		ast_log(LOG_ERROR, "Could not allocate outsock list.\n");
 		io_context_destroy(io);
-		sched = ast_sched_thread_destroy(sched);
+		ast_sched_context_destroy(sched);
+		sched = NULL;
 		return AST_MODULE_LOAD_FAILURE;
 	}
 	ast_netsock_init(outsock);
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index c12704835..fd84f1f27 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -210,7 +210,7 @@ static const struct ast_channel_tech jingle_tech = {
 
 static struct sockaddr_in bindaddr = { 0, };	/*!< The address we bind to */
 
-static struct sched_context *sched;	/*!< The scheduling context */
+static struct ast_sched_context *sched;	/*!< The scheduling context */
 static struct io_context *io;	/*!< The IO context */
 static struct in_addr __ourip;
 
@@ -1903,7 +1903,7 @@ static int load_module(void)
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
-	sched = sched_context_create();
+	sched = ast_sched_context_create();
 	if (!sched) {
 		ast_log(LOG_WARNING, "Unable to create schedule context\n");
 	}
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 499b5e55e..723849785 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -231,7 +231,7 @@ static int ourport;
 
 static int mgcpdebug = 0;
 
-static struct sched_context *sched;
+static struct ast_sched_context *sched;
 static struct io_context *io;
 /*! The private structures of the mgcp channels are linked for
  * selecting outgoing channels
@@ -4776,14 +4776,14 @@ static int reload_config(int reload)
 /*! \brief  load_module: PBX load module - initialization ---*/
 static int load_module(void)
 {
-	if (!(sched = sched_context_create())) {
+	if (!(sched = ast_sched_context_create())) {
 		ast_log(LOG_WARNING, "Unable to create schedule context\n");
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
 	if (!(io = io_context_create())) {
 		ast_log(LOG_WARNING, "Unable to create I/O context\n");
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
@@ -4794,7 +4794,7 @@ static int load_module(void)
 	if (ast_channel_register(&mgcp_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel class 'MGCP'\n");
 		io_context_destroy(io);
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
@@ -4905,7 +4905,7 @@ static int unload_module(void)
 	close(mgcpsock);
 	ast_rtp_glue_unregister(&mgcp_rtp_glue);
 	ast_cli_unregister_multiple(cli_mgcp, sizeof(cli_mgcp) / sizeof(struct ast_cli_entry));
-	sched_context_destroy(sched);
+	ast_sched_context_destroy(sched);
 
 	return 0;
 }
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 691514ddc..c292d448a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -782,7 +782,7 @@ static pthread_t monitor_thread = AST_PTHREADT_NULL;
 static int sip_reloading = FALSE;                       /*!< Flag for avoiding multiple reloads at the same time */
 static enum channelreloadreason sip_reloadreason;       /*!< Reason for last reload/load of configuration */
 
-struct sched_context *sched;     /*!< The scheduling context */
+struct ast_sched_context *sched;     /*!< The scheduling context */
 static struct io_context *io;           /*!< The IO context */
 static int *sipsock_read_id;            /*!< ID of IO entry for sipsock FD */
 struct sip_pkt;
@@ -28901,14 +28901,14 @@ static int load_module(void)
 	ASTOBJ_CONTAINER_INIT(&regl); /* Registry object list -- not searched for anything */
 	ASTOBJ_CONTAINER_INIT(&submwil); /* MWI subscription object list */
 
-	if (!(sched = sched_context_create())) {
+	if (!(sched = ast_sched_context_create())) {
 		ast_log(LOG_ERROR, "Unable to create scheduler context\n");
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
 	if (!(io = io_context_create())) {
 		ast_log(LOG_ERROR, "Unable to create I/O context\n");
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
@@ -28930,7 +28930,7 @@ static int load_module(void)
 	if (ast_channel_register(&sip_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel type 'SIP'\n");
 		io_context_destroy(io);
-		sched_context_destroy(sched);
+		ast_sched_context_destroy(sched);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 
@@ -29151,7 +29151,7 @@ static int unload_module(void)
 	clear_sip_domains();
 	ast_free_ha(sip_cfg.contact_ha);
 	close(sipsock);
-	sched_context_destroy(sched);
+	ast_sched_context_destroy(sched);
 	con = ast_context_find(used_context);
 	if (con) {
 		ast_context_destroy(con, "SIP");
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index e1c903512..0d75888ba 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1151,7 +1151,7 @@ static const char * const skinny_cxmodes[] = {
 #endif
 
 /* driver scheduler */
-static struct sched_context *sched = NULL;
+static struct ast_sched_context *sched = NULL;
 static struct io_context *io;
 
 /* Protect the monitoring thread, so only one process can kill or start it, and not
@@ -7368,7 +7368,7 @@ static int load_module(void)
 	ast_manager_register_xml("SKINNYlines", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_skinny_show_lines);
 	ast_manager_register_xml("SKINNYshowline", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, manager_skinny_show_line);
 
-	sched = sched_context_create();
+	sched = ast_sched_context_create();
 	if (!sched) {
 		ast_log(LOG_WARNING, "Unable to create schedule context\n");
 	}
@@ -7449,8 +7449,9 @@ static int unload_module(void)
 	ast_mutex_unlock(&netlock);
 
 	close(skinnysock);
-	if (sched)
-		sched_context_destroy(sched);
+	if (sched) {
+		ast_sched_context_destroy(sched);
+	}
 
 	con = ast_context_find(used_context);
 	if (con)
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 3c307a682..155890250 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -217,7 +217,7 @@ static struct {
 } qos = { 0, 0, 0, 0 };
 
 static struct io_context *io;
-static struct sched_context *sched;
+static struct ast_sched_context *sched;
 static struct sockaddr_in public_ip = { 0, };
 /*! give the IP address for the last packet received */
 static struct sockaddr_in address_from;
@@ -5645,7 +5645,7 @@ int load_module(void)
 		goto io_failed;
 	}
 
-	sched = sched_context_create();
+	sched = ast_sched_context_create();
 	if (!sched) {
 		ast_log(LOG_ERROR, "Failed to allocate scheduler context\n");
 		goto sched_failed;
@@ -5671,7 +5671,7 @@ int load_module(void)
 
 chanreg_failed:
 	/*! XXX \todo Leaking anything allocated by reload_config() ... */
-	sched_context_destroy(sched);
+	ast_sched_context_destroy(sched);
 	sched = NULL;
 sched_failed:
 	io_context_destroy(io);
@@ -5686,8 +5686,9 @@ buff_failed:
 static int unload_module(void)
 {
 	/* First, take us out of the channel loop */
-	if (sched)
-		sched_context_destroy(sched);
+	if (sched) {
+		ast_sched_context_destroy(sched);
+	}
 
 	ast_cli_unregister_multiple(unistim_cli, ARRAY_LEN(unistim_cli));
 
diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c
index e14975d5d..abf83e7d4 100644
--- a/channels/sip/dialplan_functions.c
+++ b/channels/sip/dialplan_functions.c
@@ -225,7 +225,7 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p
 }
 
 #ifdef TEST_FRAMEWORK
-static int test_sip_rtpqos_1_new(struct ast_rtp_instance *instance, struct sched_context *sched, struct ast_sockaddr *addr, void *data)
+static int test_sip_rtpqos_1_new(struct ast_rtp_instance *instance, struct ast_sched_context *sched, struct ast_sockaddr *addr, void *data)
 {
 	/* Needed to pass sanity checks */
 	ast_rtp_instance_set_data(instance, data);
diff --git a/channels/sip/include/globals.h b/channels/sip/include/globals.h
index 414d2189b..0bd2f4d2d 100644
--- a/channels/sip/include/globals.h
+++ b/channels/sip/include/globals.h
@@ -25,7 +25,7 @@
 #define _SIP_GLOBALS_H
 
 extern struct ast_sockaddr bindaddr;     /*!< UDP: The address we bind to */
-extern struct sched_context *sched;     /*!< The scheduling context */
+extern struct ast_sched_context *sched;     /*!< The scheduling context */
 
 /*! \brief Definition of this channel for PBX channel registration */
 extern const struct ast_channel_tech sip_tech;