ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/netproc.h
(Generate patch)

Comparing ray/src/util/netproc.h (file contents):
Revision 2.3 by greg, Sat Feb 22 02:07:30 2003 UTC vs.
Revision 2.7 by schorsch, Mon Oct 27 10:32:06 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   * Header file for network processing routines
4   */
5 + #ifndef _RAD_NETPROC_H_
6 + #define _RAD_NETPROC_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 /* ====================================================================
7 * The Radiance Software License, Version 1.0
8 *
9 * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 *
16 * 1. Redistributions of source code must retain the above copyright
17 *         notice, this list of conditions and the following disclaimer.
18 *
19 * 2. Redistributions in binary form must reproduce the above copyright
20 *       notice, this list of conditions and the following disclaimer in
21 *       the documentation and/or other materials provided with the
22 *       distribution.
23 *
24 * 3. The end-user documentation included with the redistribution,
25 *           if any, must include the following acknowledgment:
26 *             "This product includes Radiance software
27 *                 (http://radsite.lbl.gov/)
28 *                 developed by the Lawrence Berkeley National Laboratory
29 *               (http://www.lbl.gov/)."
30 *       Alternately, this acknowledgment may appear in the software itself,
31 *       if and wherever such third-party acknowledgments normally appear.
32 *
33 * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 *       and "The Regents of the University of California" must
35 *       not be used to endorse or promote products derived from this
36 *       software without prior written permission. For written
37 *       permission, please contact [email protected].
38 *
39 * 5. Products derived from this software may not be called "Radiance",
40 *       nor may "Radiance" appear in their name, without prior written
41 *       permission of Lawrence Berkeley National Laboratory.
42 *
43 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 * SUCH DAMAGE.
55 * ====================================================================
56 *
57 * This software consists of voluntary contributions made by many
58 * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 * information on Lawrence Berkeley National Laboratory, please see
60 * <http://www.lbl.gov/>.
61 */
11  
12   typedef struct {
13          char    *com;           /* command (stored on client side) */
# Line 67 | Line 16 | typedef struct {
16          char    *errs;          /* error output */
17          int     elen;           /* error output length */
18          int     (*cf)();        /* completion callback function */
19 < } PROC;                 /* process slot */
19 > } NETPROC;                      /* process slot (name PROC conflicts with Windows) */
20  
21   /* Callback function cf above passed process server, slot number and status */
22  
# Line 77 | Line 26 | typedef struct pserver {
26          char    directory[128]; /* remote execution directory */
27          char    username[32];   /* remote user ID */
28          short   nprocs;         /* number of allocated process slots */
29 <        PROC    proc[1];        /* process slot(s) (must be last in struct) */
29 >        NETPROC proc[1];        /* process slot(s) (must be last in struct) */
30   } PSERVER;              /* process server */
31  
32   extern PSERVER  *pslist;        /* global process server list */
33  
34 < extern PSERVER  *addpserver(), *findjob();
34 > extern PSERVER  *addpserver(char *host, char *dir, char *usr, int np);
35 > extern PSERVER  *findjob(int *pnp);
36  
37 < extern char     *myhostname();
37 > extern char     *myhostname(void);
38  
39   #define LHOSTNAME       "localhost"     /* accepted name for local host */
40  
41   #define pserverOK(ps)   (wait4job(ps, startjob(ps, "true", NULL)) == 0)
42 +
43 +
44 + #ifdef __cplusplus
45 + }
46 + #endif
47 + #endif /* _RAD_NETPROC_H_ */
48 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines