Revision: 72396
http://sourceforge.net/p/brlcad/code/72396
Author: starseeker
Date: 2019-02-11 16:12:13 +0000 (Mon, 11 Feb 2019)
Log Message:
-----------
Correct the ordering of the SEM increments - analyze should come before ged.
Modified Paths:
--------------
brlcad/trunk/include/analyze.h
brlcad/trunk/include/ged/defines.h
brlcad/trunk/src/libged/ged.c
Modified: brlcad/trunk/include/analyze.h
===================================================================
--- brlcad/trunk/include/analyze.h 2019-02-11 01:46:21 UTC (rev 72395)
+++ brlcad/trunk/include/analyze.h 2019-02-11 16:12:13 UTC (rev 72396)
@@ -31,7 +31,6 @@
#include "common.h"
#include "bu/opt.h"
#include "bu/vls.h"
-#include "ged/defines.h" /* For GED_SEM_LAST */
#include "raytrace.h"
__BEGIN_DECLS
@@ -51,7 +50,7 @@
/* Libanalyze return codes */
#define ANALYZE_OK 0x0000
#define ANALYZE_ERROR 0x0001 /**< something went wrong, function not completed
*/
-#define ANALYZE_SEM_WORKER GED_SEM_LAST
+#define ANALYZE_SEM_WORKER RT_SEM_LAST
#define ANALYZE_SEM_STATS ANALYZE_SEM_WORKER+1
#define ANALYZE_SEM_LIST ANALYZE_SEM_STATS+1
#define ANALYZE_SEM_LAST ANALYZE_SEM_LIST+1
Modified: brlcad/trunk/include/ged/defines.h
===================================================================
--- brlcad/trunk/include/ged/defines.h 2019-02-11 01:46:21 UTC (rev 72395)
+++ brlcad/trunk/include/ged/defines.h 2019-02-11 16:12:13 UTC (rev 72396)
@@ -36,6 +36,7 @@
#include "bu/vls.h"
#include "dm/bview.h"
#include "rt/search.h"
+#include "analyze.h"
__BEGIN_DECLS
@@ -87,7 +88,7 @@
* Definition of global parallel-processing semaphores.
*
*/
-#define GED_SEM_WORKER RT_SEM_LAST
+#define GED_SEM_WORKER ANALYZE_SEM_LAST
#define GED_SEM_STATS GED_SEM_WORKER+1
#define GED_SEM_LIST GED_SEM_STATS+1
#define GED_SEM_LAST GED_SEM_LIST+1
@@ -221,6 +222,9 @@
int (*del)(struct ged *gedp, const char *name);
int (*run)(struct ged *gedp, int ac, char *av[]);
+ struct analyze_densities *gd_densities; /**< @brief active density
definitions */
+ const char *gd_source; /**< @brief source of density
definitions */
+
struct ged_subprocess gd_headSubprocess; /**< @brief head of forked
processes */
void *ged_interp; /* Temporary - do not rely on when designing new
functionality */
Modified: brlcad/trunk/src/libged/ged.c
===================================================================
--- brlcad/trunk/src/libged/ged.c 2019-02-11 01:46:21 UTC (rev 72395)
+++ brlcad/trunk/src/libged/ged.c 2019-02-11 16:12:13 UTC (rev 72396)
@@ -188,6 +188,17 @@
free_object_selections(gedp->ged_selections);
bu_hash_destroy(gedp->ged_selections);
+
+
+ if (gedp->gd_densities) {
+ analyze_densities_destroy(gedp->gd_densities);
+ }
+ gedp->gd_densities = NULL;
+ if (gedp->gd_source) {
+ bu_free(gedp->gd_source, "free density source path");
+ }
+ gedp->gd_source = NULL;
+
}
@@ -267,6 +278,9 @@
gedp->ged_selections = bu_hash_create(32);
+ gedp->gd_densities = NULL;
+ gedp->gd_source = NULL;
+
/* init the solid list */
BU_GET(freesolid, struct solid);
BU_LIST_INIT(&freesolid->l);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
