[asterisk-commits] dlee: branch group/performance r399891 - in /team/group/performance: ./ main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Sep 26 10:46:11 2013
New Revision: 399891

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399891
Log:
Multiple revisions 399871-399873

........
  r399871 | dlee | 2013-09-26 08:52:46 -0500 (Thu, 26 Sep 2013) | 1 line
  
  Check for allocation failure
........
  r399872 | dlee | 2013-09-26 08:58:54 -0500 (Thu, 26 Sep 2013) | 1 line
  
  Removed silly check
........
  r399873 | dlee | 2013-09-26 09:00:04 -0500 (Thu, 26 Sep 2013) | 1 line
  
  Why did I drop that comment?
........

Merged revisions 399871-399873 from http://svn.asterisk.org/svn/asterisk/team/dlee/tp-local

Modified:
    team/group/performance/   (props changed)
    team/group/performance/main/stasis.c
    team/group/performance/main/taskprocessor.c

Propchange: team/group/performance/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 26 10:46:11 2013
@@ -1,1 +1,1 @@
-/branches/12:1-399889 /team/dlee/performance:1-399887 /team/dlee/stasis-forward-optimization:1-399888 /team/dlee/taskprocessor-optimization:1-399654 /team/dlee/tp-local:1-399866
+/branches/12:1-399889 /team/dlee/performance:1-399887 /team/dlee/stasis-forward-optimization:1-399888 /team/dlee/taskprocessor-optimization:1-399654 /team/dlee/tp-local:1-399890

Modified: team/group/performance/main/stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/main/stasis.c?view=diff&rev=399891&r1=399890&r2=399891
==============================================================================
--- team/group/performance/main/stasis.c (original)
+++ team/group/performance/main/stasis.c Thu Sep 26 10:46:11 2013
@@ -533,17 +533,12 @@
 	ast_assert(topic != NULL);
 	ast_assert(message != NULL);
 
-	if (ast_vector_size(topic->subscribers) == 0) {
-		return;
-	}
-
 	for (i = 0; i < ast_vector_size(topic->subscribers); ++i) {
-		struct stasis_subscription *sub = ast_vector_get(topic->subscribers, i);
+		struct stasis_subscription *sub =
+			ast_vector_get(topic->subscribers, i);
 
 		ast_assert(sub != NULL);
-
 		dispatch_message(sub, message);
-
 	}
 }
 
@@ -696,6 +691,7 @@
 
 	stasis_publish(topic, msg);
 
+	/* Now we have to dispatch to the subscription itself */
 	dispatch_message(sub, msg);
 }
 

Modified: team/group/performance/main/taskprocessor.c
URL: http://svnview.digium.com/svn/asterisk/team/group/performance/main/taskprocessor.c?view=diff&rev=399891&r1=399890&r2=399891
==============================================================================
--- team/group/performance/main/taskprocessor.c (original)
+++ team/group/performance/main/taskprocessor.c Thu Sep 26 10:46:11 2013
@@ -717,6 +717,11 @@
 		return -1;
 	}
 
+	if (!t) {
+		ast_log(LOG_ERROR, "t is NULL!\n");
+		return -1;
+	}
+
 	ao2_lock(tps);
 	AST_LIST_INSERT_TAIL(&tps->tps_queue, t, list);
 	previous_size = tps->tps_queue_size++;