Revision: 72287
http://sourceforge.net/p/brlcad/code/72287
Author: starseeker
Date: 2019-01-30 21:48:17 +0000 (Wed, 30 Jan 2019)
Log Message:
-----------
rename ged_run_rt to the more generic name ged_subprocess
Modified Paths:
--------------
brlcad/trunk/CHANGES
brlcad/trunk/include/ged/defines.h
brlcad/trunk/src/libged/rt.c
brlcad/trunk/src/libged/rtabort.c
brlcad/trunk/src/libged/rtwizard.c
Modified: brlcad/trunk/CHANGES
===================================================================
--- brlcad/trunk/CHANGES 2019-01-30 21:03:06 UTC (rev 72286)
+++ brlcad/trunk/CHANGES 2019-01-30 21:48:17 UTC (rev 72287)
@@ -1383,6 +1383,7 @@
renamed for API consistency [7.27]
s/bu_brlcad_data[[:space:]]*\(/bu_brlcad_root("share/"/g
replaced by new BU API
+s/struct[[:space:]]*ged_run_rt/struct ged_subprocess/g
# tentative
s/bu_getprogname\([[:space:]]*\)/bu_app_name\(NULL\)/g
Modified: brlcad/trunk/include/ged/defines.h
===================================================================
--- brlcad/trunk/include/ged/defines.h 2019-01-30 21:03:06 UTC (rev 72286)
+++ brlcad/trunk/include/ged/defines.h 2019-01-30 21:48:17 UTC (rev 72287)
@@ -115,7 +115,7 @@
#define RT_VDRW_DEF_COLOR 0xffff00
-struct ged_run_rt {
+struct ged_subprocess {
struct bu_list l;
struct bu_process *p;
#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -126,9 +126,7 @@
int fd;
int pid;
#endif
- void *chan; /* FIXME: uses communication channel instead of file
- * descriptor to get output from rt.
- */
+ void *chan;
int aborted;
};
@@ -163,7 +161,7 @@
char **gd_rt_cmd;
int gd_rt_cmd_len;
- struct ged_run_rt gd_headRunRt; /**< @brief head of
forked rt processes */
+ struct ged_subprocess gd_headRunRt; /**< @brief head of
forked rt processes */
void (*gd_rtCmdNotify)(int aborted); /**< @brief
function called when rt command completes */
Modified: brlcad/trunk/src/libged/rt.c
===================================================================
--- brlcad/trunk/src/libged/rt.c 2019-01-30 21:03:06 UTC (rev 72286)
+++ brlcad/trunk/src/libged/rt.c 2019-01-30 21:48:17 UTC (rev 72287)
@@ -42,7 +42,7 @@
struct _ged_rt_client_data {
- struct ged_run_rt *rrtp;
+ struct ged_subprocess *rrtp;
struct ged *gedp;
};
@@ -156,7 +156,7 @@
_ged_rt_output_handler(ClientData clientData, int UNUSED(mask))
{
struct _ged_rt_client_data *drcdp = (struct _ged_rt_client_data
*)clientData;
- struct ged_run_rt *run_rtp;
+ struct ged_subprocess *run_rtp;
int count = 0;
int retcode = 0;
int read_failed = 0;
@@ -164,7 +164,7 @@
if (drcdp == (struct _ged_rt_client_data *)NULL ||
drcdp->gedp == (struct ged *)NULL ||
- drcdp->rrtp == (struct ged_run_rt *)NULL)
+ drcdp->rrtp == (struct ged_subprocess *)NULL)
return;
run_rtp = drcdp->rrtp;
@@ -199,7 +199,7 @@
/* free run_rtp */
BU_LIST_DEQUEUE(&run_rtp->l);
- BU_PUT(run_rtp, struct ged_run_rt);
+ BU_PUT(run_rtp, struct ged_subprocess);
BU_PUT(drcdp, struct _ged_rt_client_data);
return;
@@ -220,7 +220,7 @@
{
FILE *fp_in;
vect_t eye_model;
- struct ged_run_rt *run_rtp;
+ struct ged_subprocess *run_rtp;
struct _ged_rt_client_data *drcdp;
struct bu_process *p = NULL;
@@ -232,7 +232,7 @@
bu_process_close(p, BU_PROCESS_STDIN);
- BU_GET(run_rtp, struct ged_run_rt);
+ BU_GET(run_rtp, struct ged_subprocess);
BU_LIST_INIT(&run_rtp->l);
BU_LIST_APPEND(&gedp->ged_gdp->gd_headRunRt.l, &run_rtp->l);
Modified: brlcad/trunk/src/libged/rtabort.c
===================================================================
--- brlcad/trunk/src/libged/rtabort.c 2019-01-30 21:03:06 UTC (rev 72286)
+++ brlcad/trunk/src/libged/rtabort.c 2019-01-30 21:48:17 UTC (rev 72287)
@@ -41,7 +41,7 @@
int
ged_rtabort(struct ged *gedp, int argc, const char *argv[])
{
- struct ged_run_rt *rrp;
+ struct ged_subprocess *rrp;
GED_CHECK_DATABASE_OPEN(gedp, GED_ERROR);
GED_CHECK_DRAWABLE(gedp, GED_ERROR);
@@ -55,7 +55,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(rrp, ged_run_rt, &gedp->ged_gdp->gd_headRunRt.l)) {
+ for (BU_LIST_FOR(rrp, ged_subprocess, &gedp->ged_gdp->gd_headRunRt.l)) {
bu_terminate(rrp->pid);
rrp->aborted = 1;
}
Modified: brlcad/trunk/src/libged/rtwizard.c
===================================================================
--- brlcad/trunk/src/libged/rtwizard.c 2019-01-30 21:03:06 UTC (rev 72286)
+++ brlcad/trunk/src/libged/rtwizard.c 2019-01-30 21:48:17 UTC (rev 72287)
@@ -40,7 +40,7 @@
#include "./ged_private.h"
struct _ged_rt_client_data {
- struct ged_run_rt *rrtp;
+ struct ged_subprocess *rrtp;
struct ged *gedp;
};
@@ -48,13 +48,13 @@
int
_ged_run_rtwizard(struct ged *gedp)
{
- struct ged_run_rt *run_rtp;
+ struct ged_subprocess *run_rtp;
struct _ged_rt_client_data *drcdp;
struct bu_process *p;
bu_process_exec(&p, gedp->ged_gdp->gd_rt_cmd[0],
gedp->ged_gdp->gd_rt_cmd_len, (const char **)gedp->ged_gdp->gd_rt_cmd, 0, 0);
- BU_GET(run_rtp, struct ged_run_rt);
+ BU_GET(run_rtp, struct ged_subprocess);
BU_LIST_INIT(&run_rtp->l);
BU_LIST_APPEND(&gedp->ged_gdp->gd_headRunRt.l, &run_rtp->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
