Revision: 69885
http://sourceforge.net/p/brlcad/code/69885
Author: brlcad
Date: 2017-06-07 11:45:26 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
prep caching is not ready, and we needed to release yesteryear, so switch it
off until next release.
Modified Paths:
--------------
brlcad/trunk/src/librt/tree.c
Modified: brlcad/trunk/src/librt/tree.c
===================================================================
--- brlcad/trunk/src/librt/tree.c 2017-06-02 19:52:16 UTC (rev 69884)
+++ brlcad/trunk/src/librt/tree.c 2017-06-07 11:45:26 UTC (rev 69885)
@@ -32,7 +32,9 @@
#include "rt/db4.h"
#include "raytrace.h"
-#include "./cache.h"
+#ifdef CACHE_ENABLED
+# include "./cache.h"
+#endif
#define ACQUIRE_SEMAPHORE_TREE(_hash) switch ((_hash)&03) { \
@@ -126,7 +128,9 @@
struct rt_gettree_data
{
struct bu_hash_tbl *tbl;
+#ifdef CACHE_ENABLED
struct rt_cache *cache;
+#endif
};
@@ -521,7 +525,11 @@
* that is OK, as long as idb_ptr is set to null. Note that the
* prep routine may have changed st_id.
*/
+#ifdef CACHE_ENABLED
ret = rt_cache_prep(data->cache, stp, ip);
+#else
+ ret = rt_obj_prep(stp, ip, stp->st_rtip);
+#endif
if (ret) {
int hash;
@@ -772,7 +780,9 @@
}
data.tbl = tbl;
+#ifdef CACHE_ENABLED
data.cache = rt_cache_open();
+#endif
i = db_walk_tree(rtip->rti_dbip, argc, argv, ncpus,
&tree_state,
@@ -781,7 +791,9 @@
_rt_gettree_leaf, (void *)&data);
bu_avs_free(&tree_state.ts_attrs);
+#ifdef CACHE_ENABLED
rt_cache_close(data.cache);
+#endif
}
/* DEBUG: Ensure that all region trees are valid */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
