Changeset 6609 for nanoscale


Ignore:
Timestamp:
Nov 11, 2016 1:37:02 AM (8 years ago)
Author:
ldelgass
Message:

Update config files with timeout values for geovis,nanovis,vtkvis

Location:
nanoscale/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • nanoscale/trunk/renderservers.cfg.in

    r6571 r6609  
    2020# Registers a server by <name> at port <port>.
    2121# When a connection is made to <port>, <command> is run.
    22 # Environment variables will be set before executing command. 
     22# Environment variables will be set before executing command.
    2323#
    2424# Note: Don't set DISPLAY here. nanoscale itself sets the DISPLAY
    … …  
    2626#
    2727# Defaults:
    28 #   o Server reads from file descriptor 0.
    29 #   o Server writes to descriptor 1.
    30 #   o Server stdout and stderr are redirected to a log file. 
     28#   - Server reads from file descriptor 0.
     29#   - Server writes to descriptor 1.
     30#   - Server stdout and stderr are redirected to a log file.
    3131#
    3232
    33 # GeoVis server (port 2015) --
    34 #     Map renderer
     33# GeoVis --
     34#       Server Type     Map and globe renderer
     35#       Port            2015
     36#       Threaded        yes
     37# Notes:
    3538#
    3639server geovis 2015 -output 3 -logstdout 0 -logstderr 0
    37 cmd @exec_prefix@/bin/geovis -o 3 -p @libdir@/resources
     40cmd @exec_prefix@/bin/geovis -o 3 -t 43260 -p @libdir@/resources
    3841env LD_LIBRARY_PATH @libdir@
    3942env OSGEARTH_DEFAULT_FONT /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf
    … …  
    4447#       Port            2000
    4548#       Threaded        yes
    46 # Notes:
    47 #       o Continue to use default options until we offically upgrade
    48 #         nanovis to the latest release.  We are currently using a 1.2
    49 #         version of nanovis.
    50 #       o Requires change to 1.2 nanovis.  Can't redirect stderr to log
    51 #         or X will complain about performing socket operation on non-socket
    52 #         descriptor.
     49# Notes:
    5350#
    5451server nanovis 2000 -output 3 -logstdout 0 -logstderr 0
    55 cmd @exec_prefix@/bin/nanovis -o 3 -p @libdir@/shaders:@libdir@/resources
     52cmd @exec_prefix@/bin/nanovis -o 3 -t 43260 -p @libdir@/shaders:@libdir@/resources
    5653env LD_LIBRARY_PATH @libdir@
    5754env __GL_SYNC_TO_VBLANK 0
    5855
    5956# VtkVis --
    60 #       Server type     3D drawings (scene graphs). Contour and surface graphs.
     57#       Server Type     VTK based 3D renderer
    6158#       Port            2010
    6259#       Threaded        yes
    6360# Notes:
    64 #       o Removed ${vtkdir} from LD_LIRBRARY_PATH. Not needed with VTK 6.
    65 #       o Using new features in nanoscale/vtkvis to use file descriptor 3
    66 #         for server output.  No automatic logging of stdout and stderr.
    6761#
    6862server vtkvis 2010 -output 3 -logstdout 0 -logstderr 0
    69 cmd @exec_prefix@/bin/vtkvis -o 3
     63cmd @exec_prefix@/bin/vtkvis -o 3 -t 43260
    7064env LD_LIBRARY_PATH @libdir@
    7165env __GL_SYNC_TO_VBLANK 0
    7266
    73 # PymolProxy -- 
    74 #       Server type     Molecular layouts using Pymol viewer.
     67# PymolProxy --
     68#       Server Type     Molecular layouts using Pymol viewer
    7569#       Port            2020
    7670#       Threaded        yes
    7771# Notes:
    78 #       o Need PYMOL_SITE_PATH for parallelpiped box.py location.
    79 #       o Makes no sense to log stdout and stderr of the proxy.
    80 #       o Renamed to just pymolproxy and removed non-threaded entry.
     72#       - Need PYMOL_SITE_PATH for parallelpiped box.py location.
     73#       - For debug tracing, redirect stderr of the proxy to a log file.
    8174#
    82 server pymolproxy 2020 -logstdout 0 -logstderr 0
     75server pymolproxy 2020 -logstdout 0 -logstderr 0 -combinelogs 0
    8376cmd @exec_prefix@/bin/pymolproxy @exec_prefix@/bin/pymol -p -q -i -x -X 0 -Y 0
    8477env PYMOL_SITE_PATH @libdir@/pymol
    … …  
    8679env __GL_SYNC_TO_VBLANK 0
    8780
    88 # VmdShow -- 
    89 #       Server type     Molecular layouts using VMD viewer (for mdshowcase).
     81# VmdShow --
     82#       Server Type     Molecular layouts using VMD viewer (for mdshowcase)
    9083#       Port            2018
    9184#       Threaded        no
    9285# Notes:
    93 #       o Commands are sent directly to the VMD process that uses custom
     86#       - Commands are sent directly to the VMD process that uses custom
    9487#         TCL code to process.
    95 #       o Redirect input to descriptor 3: Otherwise VMD will get select hit.
    96 #       o Redirect output to descriptor 4: Lots of information written to
     88#       - Redirect input to descriptor 3: Otherwise VMD will get select hit.
     89#       - Redirect output to descriptor 4: Lots of information written to
    9790#         stdout and stderr of VMD.  Captured in log file.
    98 #       o Executing binary without wrapper shell script. Requires VMDDIR set.
    99 #       o Meshing programs surf and msms require explicit environment variables.
    100 #       o __GL_SYNC_TO_VBLANK probably doesn't matter.
    101 #       o Client doesn't send data files to VMD, but file paths.  Unlikely
    102 #         client will block on a large write. 
    103 #       
     91#       - Executing binary without wrapper shell script. Requires VMDDIR set.
     92#       - Meshing programs surf and msms require explicit environment variables.
     93#       - Client doesn't send data files to VMD, but file paths.  Unlikely
     94#         client will block on a large write.
     95#
    10496server vmdshow 2018 -input 3 -output 4 -combinelogs 1
    10597cmd @libdir@/vmd/vmd_LINUXAMD64 -startup @libdir@/vmd/vmdserver.tcl -args -stdio

  • nanoscale/trunk/renderservers.tcl.in

    r6571 r6609  
    1818#       } {
    1919#           variables...
    20 #       } 
     20#       }
    2121#
    2222# Registers a server by <name> at port <port>.
    2323# 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.
    2525#
    2626# Note: Don't set DISPLAY here. nanoscale itself sets the DISPLAY
    … …  
    2828#
    2929# Defaults:
    30 #   o Server reads from file descriptor 0.
    31 #   o Server 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.
    3333#
    3434
    … …  
    3737set libdir "@libdir@"
    3838
    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:
    4144#
    42 register_server geovis 2015 \
    43     -output 3 -logstdout no -logstderr no \
    44 {
    45     ${bindir}/geovis -o 3 -p ${libdir}/resources
     45register_server geovis 2015 -output 3 -logstdout 0 -logstderr 0 {
     46    ${bindir}/geovis -o 3 -t 43260 -p ${libdir}/resources
    4647} {
    4748    LD_LIBRARY_PATH ${libdir}
    … …  
    5455#       Port            2000
    5556#       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:
    6358#
    64 register_server nanovis 2000 \
    65     -output 3 -logstdout no -logstderr no \
    66 {
    67     ${bindir}/nanovis -o 3 -p ${libdir}/shaders:${libdir}/resources
     59register_server nanovis 2000 -output 3 -logstdout 0 -logstderr 0 {
     60    ${bindir}/nanovis -o 3 -t 43260 -p ${libdir}/shaders:${libdir}/resources
    6861} {
    6962    LD_LIBRARY_PATH ${libdir}
    … …  
    7265
    7366# VtkVis --
    74 #       Server type     3D drawings (scene graphs). Contour and surface graphs.
     67#       Server Type     VTK based 3D renderer
    7568#       Port            2010
    7669#       Threaded        yes
    7770# 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 3
    80 #         for server output.  No automatic logging of stdout and stderr.
    8171#
    82 register_server vtkvis 2010 \
    83     -output 3 -logstdout no -logstderr no \
    84 {
    85     ${bindir}/vtkvis -o 3
     72register_server vtkvis 2010 -output 3 -logstdout 0 -logstderr 0 {
     73    ${bindir}/vtkvis -o 3 -t 43260
    8674} {
    8775    LD_LIBRARY_PATH ${libdir}
    … …  
    8977}
    9078
    91 # PymolProxy -- 
    92 #       Server type     Molecular layouts using Pymol viewer.
     79# PymolProxy --
     80#       Server Type     Molecular layouts using Pymol viewer
    9381#       Port            2020
    9482#       Threaded        yes
    9583# 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.
    9986#
    100 register_server pymolproxy 2020 \
    101     -logstdout no -logstderr no \
    102 {
     87register_server pymolproxy 2020 -logstdout 0 -logstderr 0 -combinelogs 0 {
    10388    ${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0
    10489} {
    … …  
    10893}
    10994
    110 # VmdShow -- 
    111 #       Server type     Molecular layouts using VMD viewer (for mdshowcase).
     95# VmdShow --
     96#       Server Type     Molecular layouts using VMD viewer (for mdshowcase)
    11297#       Port            2018
    11398#       Threaded        no
    11499# Notes:
    115 #       o Commands are sent directly to the VMD process that uses custom
     100#       - Commands are sent directly to the VMD process that uses custom
    116101#         TCL code to process.
    117 #       o Redirect input to descriptor 3: Otherwise VMD will get select hit.
    118 #       o Redirect output to descriptor 4: Lots of information written to
     102#       - Redirect input to descriptor 3: Otherwise VMD will get select hit.
     103#       - Redirect output to descriptor 4: Lots of information written to
    119104#         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#
     110register_server vmdshow 2018 -input 3 -output 4 -combinelogs 1 {
    129111    ${libdir}/vmd/vmd_LINUXAMD64 -startup ${libdir}/vmd/vmdserver.tcl \
    130112        -args -stdio

  • nanoscale/trunk/server.c

    r6572 r6609  
    352352                        serverPtr->name, getpid());
    353353                    if (serverPtr->logStdout) {
    354                         newFd = open(path, O_WRONLY | O_CREAT| O_TRUNC, 0600);
     354                        newFd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
    355355                    } else {
    356356                        newFd = open("/dev/null", O_WRONLY, 0600);
Note: See TracChangeset for help on using the changeset viewer.