[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21255] branches/soc-2009-jaguarandi/ source/blender/render/intern: Measure build time...

[André Pinto]

Revision: 21255
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21255
Author:   jaguarandi
Date:     2009-06-30 03:17:50 +0200 (Tue, 30 Jun 2009)

Log Message:
-----------
Measure build time...
*as expected it's a lot faster on BVH

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
    branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c

Modified: branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h	2009-06-30 00:42:17 UTC (rev 21254)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/include/rayobject.h	2009-06-30 01:17:50 UTC (rev 21255)
@@ -120,4 +120,31 @@
 
 #define ISECT_EPSILON ((float)FLT_EPSILON)
 
+
+
+#if !defined(_WIN32)
+
+#include <sys/time.h>
+#include <time.h>
+#include <stdio.h>
+
+#define BENCH(a,name)	\
+	do {			\
+		double _t1, _t2;				\
+		struct timeval _tstart, _tend;	\
+		clock_t _clock_init = clock();	\
+		gettimeofday ( &_tstart, NULL);	\
+		(a);							\
+		gettimeofday ( &_tend, NULL);	\
+		_t1 = ( double ) _tstart.tv_sec + ( double ) _tstart.tv_usec/ ( 1000*1000 );	\
+		_t2 = ( double )   _tend.tv_sec + ( double )   _tend.tv_usec/ ( 1000*1000 );	\
+		printf("BENCH:%s: %fs (real) %fs (cpu)\n", #name, _t2-_t1, (float)(clock()-_clock_init)/CLOCKS_PER_SEC);\
+	} while(0)
+#else
+
+#define BENCH(a)	(a)
+
 #endif
+
+
+#endif

Modified: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c	2009-06-30 00:42:17 UTC (rev 21254)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayshade.c	2009-06-30 01:17:50 UTC (rev 21255)
@@ -320,9 +320,9 @@
 void makeraytree(Render *re)
 {
 	if(ELEM(re->r.raystructure, R_RAYSTRUCTURE_SINGLE_BVH, R_RAYSTRUCTURE_SINGLE_OCTREE))
-		makeraytree_single(re);
+		BENCH(makeraytree_single(re), tree_build);
 	else
-		makeraytree_hier(re);
+		BENCH(makeraytree_hier(re), tree_build);
 }