Revision: 76928
http://sourceforge.net/p/brlcad/code/76928
Author: starseeker
Date: 2020-08-24 22:00:51 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
Make it a little easier to grep for the MGED dirty flag. The attached X dm
seems to be hot spinning (refreshing continually when nothing has changed,
maxing one CPU core), need to figure out why...
Modified Paths:
--------------
brlcad/trunk/src/mged/adc.c
brlcad/trunk/src/mged/attach.c
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/dm-generic.c
brlcad/trunk/src/mged/doevent.c
brlcad/trunk/src/mged/fbserv.c
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/mged_dm.h
brlcad/trunk/src/mged/predictor.c
brlcad/trunk/src/mged/set.c
Modified: brlcad/trunk/src/mged/adc.c
===================================================================
--- brlcad/trunk/src/mged/adc.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/adc.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -96,7 +96,7 @@
if (dmlp->dml_adc_state == adc_state) {
set_curr_dm(dmlp);
set_scroll();
- dirty = 1;
+ DMP_dirty = 1;
}
set_curr_dm(save_dmlp);
Modified: brlcad/trunk/src/mged/attach.c
===================================================================
--- brlcad/trunk/src/mged/attach.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/attach.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -671,7 +671,7 @@
view_state->vs_rc = 1;
view_ring_init(curr_dm_list->dml_view_state, (struct _view_state *)NULL);
- dirty = 1;
+ DMP_dirty = 1;
mapped = 1;
netfd = -1;
owner = 1;
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -1459,7 +1459,7 @@
scroll_y = dml->dml_scroll_y;
memmove((void *)scroll_array, (void *)dml->dml_scroll_array, sizeof(struct
scroll_item *) * 6);
- dirty = 1;
+ DMP_dirty = 1;
refresh();
view_state = vsp; /* restore state info pointer */
Modified: brlcad/trunk/src/mged/dm-generic.c
===================================================================
--- brlcad/trunk/src/mged/dm-generic.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/dm-generic.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -585,7 +585,7 @@
return TCL_ERROR;
}
- dirty = 1;
+ DMP_dirty = 1;
(void)dm_make_current(DMP);
return dm_set_bg(DMP, r, g, b);
}
@@ -635,7 +635,7 @@
set_hook_data(struct mged_view_hook_state *hs) {
hs->hs_dmp = DMP;
hs->vs = view_state;
- hs->dirty_global = &(dirty);
+ hs->dirty_global = &(DMP_dirty);
return (void *)hs;
}
Modified: brlcad/trunk/src/mged/doevent.c
===================================================================
--- brlcad/trunk/src/mged/doevent.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/doevent.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -135,7 +135,7 @@
/* calling the display manager specific event handler */
status = dm_doevent(DMP, clientData, eventPtr);
- dirty = dm_get_dirty(DMP);
+ DMP_dirty = dm_get_dirty(DMP);
/* no further processing of this event */
if (status != TCL_OK) {
@@ -150,7 +150,7 @@
dm_configure_win(DMP, 0);
rect_image2view();
- dirty = 1;
+ DMP_dirty = 1;
if (fbp)
(void)fb_configure_window(fbp, conf->width, conf->height);
Modified: brlcad/trunk/src/mged/fbserv.c
===================================================================
--- brlcad/trunk/src/mged/fbserv.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/fbserv.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -144,7 +144,7 @@
bu_log("pkg_process error encountered (1)\n");
if (npp > 0)
- dirty = 1;
+ DMP_dirty = 1;
if (clients[i].c_fd != fd)
continue;
@@ -160,7 +160,7 @@
bu_log("pkg_process error encountered (2)\n");
if (npp > 0)
- dirty = 1;
+ DMP_dirty = 1;
}
/* restore */
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/mged.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -2305,7 +2305,7 @@
* Otherwise, we are happy with the view we have
*/
set_curr_dm(p);
- if (mapped && dirty) {
+ if (mapped && DMP_dirty) {
int restore_zbuffer = 0;
if (mged_variables->mv_fb &&
@@ -2315,7 +2315,7 @@
(void)dm_set_zbuffer(DMP, 0);
}
- dirty = 0;
+ DMP_dirty = 0;
do_time = 1;
VMOVE(geometry_default_color, color_scheme->cs_geo_def);
Modified: brlcad/trunk/src/mged/mged_dm.h
===================================================================
--- brlcad/trunk/src/mged/mged_dm.h 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/mged_dm.h 2020-08-24 22:00:51 UTC (rev 76928)
@@ -443,6 +443,7 @@
#define DM_LIST_NULL ((struct dm_list *)NULL)
#define DMP curr_dm_list->dml_dmp
+#define DMP_dirty curr_dm_list->dml_dirty
#define fbp curr_dm_list->dml_fbp
#define netfd curr_dm_list->dml_netfd
#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -449,7 +450,6 @@
#define netchan curr_dm_list->dml_netchan
#endif
#define clients curr_dm_list->dml_clients
-#define dirty curr_dm_list->dml_dirty
#define mapped curr_dm_list->dml_mapped
#define owner curr_dm_list->dml_owner
#define am_mode curr_dm_list->dml_am_mode
Modified: brlcad/trunk/src/mged/predictor.c
===================================================================
--- brlcad/trunk/src/mged/predictor.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/predictor.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -315,7 +315,7 @@
else
predictor_kill();
- dirty = 1;
+ DMP_dirty = 1;
}
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2020-08-24 21:05:56 UTC (rev 76927)
+++ brlcad/trunk/src/mged/set.c 2020-08-24 22:00:51 UTC (rev 76928)
@@ -320,7 +320,7 @@
mged_svbase();
set_scroll(); /* set scroll_array for drawing the
scroll bars */
- dirty = 1;
+ DMP_dirty = 1;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
