Revision: 76908
http://sourceforge.net/p/brlcad/code/76908
Author: starseeker
Date: 2020-08-23 17:48:46 +0000 (Sun, 23 Aug 2020)
Log Message:
-----------
Report the TCP port, which is what the user is most likely to actually need
when setting up a remrt run.
Modified Paths:
--------------
brlcad/trunk/NEWS
brlcad/trunk/doc/docbook/system/man1/remrt.xml
brlcad/trunk/src/remrt/remrt.c
Modified: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS 2020-08-23 16:44:34 UTC (rev 76907)
+++ brlcad/trunk/NEWS 2020-08-23 17:48:46 UTC (rev 76908)
@@ -13,6 +13,7 @@
--- 2020-08-XX Release 7.32.X ---
----------------------------------------------------------------------
+* added line reporting TCP listening port to remrt output - Cliff Yapp
* added help options support (-h,-?) to asc2dsp and g2asc - Cliff Yapp
* fixed crash when drawing a VOL with missing data - Cliff Yapp
* facetall.sh script is replaced by MGED facetize command - Cliff Yapp
Modified: brlcad/trunk/doc/docbook/system/man1/remrt.xml
===================================================================
--- brlcad/trunk/doc/docbook/system/man1/remrt.xml 2020-08-23 16:44:34 UTC
(rev 76907)
+++ brlcad/trunk/doc/docbook/system/man1/remrt.xml 2020-08-23 17:48:46 UTC
(rev 76908)
@@ -326,7 +326,7 @@
For a somewhat larger render we specify a size of 2048 pixels square.
</para>
<para>
- <userinput>fbserv -s2048 -P0 -F/dev/X</userinput>
+ <userinput>fbserv -s2048 -p0 -F/dev/X</userinput>
</para>
<para>
If an graphical framebuffer was specified, a window should appear.
Otherwise, fbserv will silently
@@ -358,12 +358,14 @@
pkg_permserver(rtsrv, 8): unknown service
08/22 21:51:41 Automatic REMRT on machine
-08/22 21:51:41 Listening at port 24081, reading script on stdin
+08/23 21:51:41 Assigned LIBPKG permport 24081
+08/23 21:51:41 Listening at TCP port 4446
+08/23 21:51:41 Reading script on stdin
08/22 21:51:41 Starting to scan animation script
08/22 21:51:41 Animation script loaded
08/22 21:51:41 Worker assignment interval=5 seconds:
Server Last Last Average Cur Machine
- State Lump Elapsed pix/sec Frame Name
+ State Lump Elapsed pix/sec Frame Name
-------- ----- ------- ------- ----- -------------
08/22 21:51:41 Seeking servers to start
</literallayout>
Modified: brlcad/trunk/src/remrt/remrt.c
===================================================================
--- brlcad/trunk/src/remrt/remrt.c 2020-08-23 16:44:34 UTC (rev 76907)
+++ brlcad/trunk/src/remrt/remrt.c 2020-08-23 17:48:46 UTC (rev 76908)
@@ -97,6 +97,8 @@
# endif
#endif
+#define REMRT_TCP_DEFAULT_PORT 4446
+
#define TARDY_SERVER_INTERVAL (900*60) /* max seconds of silence */
#define N_SERVER_ASSIGNMENTS 1 /* desired # of assignments */
#define MIN_ASSIGNMENT_TIME 5 /* desired seconds/result */
@@ -3555,11 +3557,13 @@
}
/* Listen for our PKG connections */
+ int tcp_num = 0;
if ((tcp_listen_fd = pkg_permserver("rtsrv", "tcp", 8, remrt_log)) < 0) {
char num[8];
/* Do it by the numbers */
for (i = 0; i < 10; i++) {
- sprintf(num, "%d", 4446+i);
+ tcp_num = REMRT_TCP_DEFAULT_PORT+i;
+ sprintf(num, "%d", tcp_num);
if ((tcp_listen_fd = pkg_permserver(num, "tcp", 8, remrt_log)) < 0)
continue;
break;
@@ -3574,7 +3578,10 @@
if (argc <= 1) {
(void)signal(SIGINT, SIG_IGN);
bu_log("%s Interactive REMRT on %s\n", stamp(), our_hostname);
- bu_log("%s Listening at port %d\n", stamp(), pkg_permport);
+ bu_log("%s Assigned LIBPKG permport %d\n", stamp(), pkg_permport);
+ if (tcp_num > 0) {
+ bu_log("%s Listening at TCP port %d\n", stamp(), tcp_num);
+ }
FD_ZERO(&clients);
FD_SET(fileno(stdin), &clients);
@@ -3597,8 +3604,11 @@
bu_log("%s Out of clients\n", stamp());
} else {
bu_log("%s Automatic REMRT on %s\n", stamp(), our_hostname);
- bu_log("%s Listening at port %d, reading script on stdin\n",
- stamp(), pkg_permport);
+ bu_log("%s Assigned LIBPKG permport %d\n", stamp(), pkg_permport);
+ if (tcp_num > 0) {
+ bu_log("%s Listening at TCP port %d\n", stamp(), tcp_num);
+ }
+ bu_log("%s Reading script on stdin\n", stamp());
FD_ZERO(&clients);
/* parse command line args for sizes, etc. */
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
