[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60187] branches/soc-2013-depsgraph_mt/ source/blender/blenkernel/intern/scene.c: Simplify code around detailed analysis in scene.c

[Sergey Sharybin]

Revision: 60187
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60187
Author:   nazgul
Date:     2013-09-17 08:29:48 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
Simplify code around detailed analysis in scene.c

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c	2013-09-17 07:03:13 UTC (rev 60186)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/scene.c	2013-09-17 08:29:48 UTC (rev 60187)
@@ -1232,11 +1232,7 @@
 
 		PRINT("Thread %d: update object %s\n", threadid, object->id.name);
 
-#ifdef DETAILED_ANALYSIS_OUTPUT
-		{
-#else
 		if (G.debug & G_DEBUG) {
-#endif
 			start_time = PIL_check_seconds_timer();
 
 			if (object->recalc & OB_RECALC_ALL) {
@@ -1281,11 +1277,17 @@
 	BLI_task_pool_push(task_pool, scene_update_object_func, node, false, TASK_PRIORITY_LOW);
 }
 
-#ifdef DETAILED_ANALYSIS_OUTPUT
-static void print_thread_statistics_for_analysis(ThreadedObjectUpdateState *state)
+static void print_threads_statistics(ThreadedObjectUpdateState *state)
 {
+	int i, tot_thread;
+
+	if ((G.debug & G_DEBUG) == 0) {
+		return;
+	}
+
+#ifdef DETAILED_ANALYSIS_OUTPUT
 	if (state->has_updated_objects) {
-		int i, tot_thread = BLI_system_thread_count();
+		tot_thread = BLI_system_thread_count();
 
 		fprintf(stderr, "objects update base time %f\n", state->base_time);
 
@@ -1302,16 +1304,7 @@
 			BLI_freelistN(&state->statistics[i]);
 		}
 	}
-}
 #else
-static void print_threads_statistics(ThreadedObjectUpdateState *state)
-{
-	int i, tot_thread;
-
-	if ((G.debug & G_DEBUG) == 0) {
-		return;
-	}
-
 	tot_thread = BLI_system_thread_count();
 
 	for (i = 0; i < tot_thread; i++) {
@@ -1341,8 +1334,8 @@
 
 		BLI_freelistN(&state->statistics[i]);
 	}
-}
 #endif
+}
 
 static void scene_update_objects(EvaluationContext *evaluation_context, Scene *scene, Scene *scene_parent, bool use_threads)
 {
@@ -1368,13 +1361,9 @@
 	BLI_task_pool_work_and_wait(task_pool);
 	BLI_task_pool_free(task_pool);
 
-#ifdef DETAILED_ANALYSIS_OUTPUT
-	print_thread_statistics_for_analysis(&state);
-#else
 	if (G.debug & G_DEBUG) {
 		print_threads_statistics(&state);
 	}
-#endif
 }
 
  static void scene_update_tagged_recursive(EvaluationContext *evaluation_context, Main *bmain, Scene *scene, Scene *scene_parent, bool use_threads)