Changeset 6622 for nanoscale/branches/1.0
- Timestamp:
- Nov 14, 2016, 12:25:18 PM (8 years ago)
- Location:
- nanoscale/branches/1.0
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
nanoscale/branches/1.0
- Property svn:mergeinfo changed
/nanoscale/trunk merged: 6506,6574,6609
- Property svn:mergeinfo changed
-
nanoscale/branches/1.0/Makefile.in
r4585 r6622 60 60 61 61 clean: 62 $(RM) -r a.out $(SERVER_OBJS) *~ core* $(TARGETS) *.log *.tmp logfile*.deps/*.d62 $(RM) -r a.out *.o *~ core* $(TARGETS) .deps/*.d 63 63 64 64 distclean: clean -
nanoscale/branches/1.0/renderservers.tcl.in
r6505 r6622 18 18 # } { 19 19 # variables... 20 # } 20 # } 21 21 # 22 22 # Registers a server by <name> at port <port>. 23 23 # When a connection is made to <port>, <command> is run. 24 # Environment variables will be set before executing command. 24 # Environment variables will be set before executing command. 25 25 # 26 26 # Note: Don't set DISPLAY here. nanoscale itself sets the DISPLAY … … 28 28 # 29 29 # Defaults: 30 # oServer reads from file descriptor 0.31 # oServer writes to descriptor 1.32 # o Server stdout and stderr are redirected to a log file.30 # - Server reads from file descriptor 0. 31 # - Server writes to descriptor 1. 32 # - Server stdout and stderr are redirected to a log file. 33 33 # 34 34 … … 37 37 set libdir "@libdir@" 38 38 39 # GeoVis server (port 2015) -- 40 # Map renderer 39 # GeoVis -- 40 # Server Type Map and globe renderer 41 # Port 2015 42 # Threaded yes 43 # Notes: 41 44 # 42 register_server geovis 2015 \ 43 -output 3 -logstdout no -logstderr no \ 44 { 45 ${bindir}/geovis -o 3 -p ${libdir}/resources 45 register_server geovis 2015 -output 3 -logstdout 0 -logstderr 0 { 46 ${bindir}/geovis -o 3 -t 43260 -p ${libdir}/resources 46 47 } { 47 48 LD_LIBRARY_PATH ${libdir} … … 54 55 # Port 2000 55 56 # Threaded yes 56 # Notes: 57 # o Continue to use default options until we offically upgrade 58 # nanovis to the latest release. We are currently using a 1.2 59 # version of nanovis. 60 # o Requires change to 1.2 nanovis. Can't redirect stderr to log 61 # or X will complain about performing socket operation on non-socket 62 # descriptor. 57 # Notes: 63 58 # 64 register_server nanovis 2000 \ 65 -output 3 -logstdout no -logstderr no \ 66 { 67 ${bindir}/nanovis -o 3 -p ${libdir}/shaders:${libdir}/resources 59 register_server nanovis 2000 -output 3 -logstdout 0 -logstderr 0 { 60 ${bindir}/nanovis -o 3 -t 43260 -p ${libdir}/shaders:${libdir}/resources 68 61 } { 69 62 LD_LIBRARY_PATH ${libdir} … … 72 65 73 66 # VtkVis -- 74 # Server type 3D drawings (scene graphs). Contour and surface graphs.67 # Server Type VTK based 3D renderer 75 68 # Port 2010 76 69 # Threaded yes 77 70 # Notes: 78 # o Removed ${vtkdir} from LD_LIRBRARY_PATH. Not needed with VTK 6.79 # o Using new features in nanoscale/vtkvis to use file descriptor 380 # for server output. No automatic logging of stdout and stderr.81 71 # 82 register_server vtkvis 2010 \ 83 -output 3 -logstdout no -logstderr no \ 84 { 85 ${bindir}/vtkvis -o 3 72 register_server vtkvis 2010 -output 3 -logstdout 0 -logstderr 0 { 73 ${bindir}/vtkvis -o 3 -t 43260 86 74 } { 87 75 LD_LIBRARY_PATH ${libdir} … … 89 77 } 90 78 91 # PymolProxy -- 92 # Server type Molecular layouts using Pymol viewer.79 # PymolProxy -- 80 # Server Type Molecular layouts using Pymol viewer 93 81 # Port 2020 94 82 # Threaded yes 95 83 # Notes: 96 # o Need PYMOL_SITE_PATH for parallelpiped box.py location. 97 # o Makes no sense to log stdout and stderr of the proxy. 98 # o Renamed to just pymolproxy and removed non-threaded entry. 84 # - Need PYMOL_SITE_PATH for parallelpiped box.py location. 85 # - For debug tracing, redirect stderr of the proxy to a log file. 99 86 # 100 register_server pymolproxy 2020 \ 101 -logstdout no -logstderr no \ 102 { 87 register_server pymolproxy 2020 -logstdout 0 -logstderr 0 -combinelogs 0 { 103 88 ${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0 104 89 } { … … 108 93 } 109 94 110 # VmdShow -- 111 # Server type Molecular layouts using VMD viewer (for mdshowcase).95 # VmdShow -- 96 # Server Type Molecular layouts using VMD viewer (for mdshowcase) 112 97 # Port 2018 113 98 # Threaded no 114 99 # Notes: 115 # oCommands are sent directly to the VMD process that uses custom100 # - Commands are sent directly to the VMD process that uses custom 116 101 # TCL code to process. 117 # oRedirect input to descriptor 3: Otherwise VMD will get select hit.118 # oRedirect output to descriptor 4: Lots of information written to102 # - Redirect input to descriptor 3: Otherwise VMD will get select hit. 103 # - Redirect output to descriptor 4: Lots of information written to 119 104 # stdout and stderr of VMD. Captured in log file. 120 # o Executing binary without wrapper shell script. Requires VMDDIR set. 121 # o Meshing programs surf and msms require explicit environment variables. 122 # o __GL_SYNC_TO_VBLANK probably doesn't matter. 123 # o Client doesn't send data files to VMD, but file paths. Unlikely 124 # client will block on a large write. 125 # 126 register_server vmdshow 2018 \ 127 -input 3 -output 4 -combinelogs yes \ 128 { 105 # - Executing binary without wrapper shell script. Requires VMDDIR set. 106 # - Meshing programs surf and msms require explicit environment variables. 107 # - Client doesn't send data files to VMD, but file paths. Unlikely 108 # client will block on a large write. 109 # 110 register_server vmdshow 2018 -input 3 -output 4 -combinelogs 1 { 129 111 ${libdir}/vmd/vmd_LINUXAMD64 -startup ${libdir}/vmd/vmdserver.tcl \ 130 112 -args -stdio … … 134 116 MSMSSERVER ${libdir}/vmd/msms 135 117 STRIDE_BIN ${libdir}/vmd/stride 136 LD_LIBRARY_PATH ""137 118 __GL_SYNC_TO_VBLANK 0 138 119 } -
nanoscale/branches/1.0/server.c
r6505 r6622 548 548 serverPtr->name, getpid()); 549 549 if (serverPtr->logStdout) { 550 newFd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);550 newFd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); 551 551 } else { 552 552 newFd = open("/dev/null", O_WRONLY, 0600); … … 639 639 display[3] = screenNum + '0'; 640 640 setenv("DISPLAY", display, 1); 641 /* Set the enviroment, if necessary. */ 641 /* Don't pollute child's environment with our library path. 642 * Library path should be explicitly set in config if needed. 643 */ 644 unsetenv("LD_LIBRARY_PATH"); 645 /* Set the configured environment */ 642 646 for (i = 0; i < serverPtr->numEnvArgs; i += 2) { 643 647 setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 1);
Note: See TracChangeset
for help on using the changeset viewer.