ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/radiance/src/rt/persist.c

Comparing src/rt/persist.c (file contents):
Revision 2.26 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.32 by greg, Mon Oct 20 16:01:55 2003 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*  External symbols declared in ray.h
8		*/
9
10	<	/* ====================================================================
11	<	* The Radiance Software License, Version 1.0
12	<	*
13	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
15	<	*
16	<	* Redistribution and use in source and binary forms, with or without
17	<	* modification, are permitted provided that the following conditions
18	<	* are met:
19	<	*
20	<	* 1. Redistributions of source code must retain the above copyright
21	<	*         notice, this list of conditions and the following disclaimer.
22	<	*
23	<	* 2. Redistributions in binary form must reproduce the above copyright
24	<	*       notice, this list of conditions and the following disclaimer in
25	<	*       the documentation and/or other materials provided with the
26	<	*       distribution.
27	<	*
28	<	* 3. The end-user documentation included with the redistribution,
29	<	*           if any, must include the following acknowledgment:
30	<	*             "This product includes Radiance software
31	<	*                 (http://radsite.lbl.gov/)
32	<	*                 developed by the Lawrence Berkeley National Laboratory
33	<	*               (http://www.lbl.gov/)."
34	<	*       Alternately, this acknowledgment may appear in the software itself,
35	<	*       if and wherever such third-party acknowledgments normally appear.
36	<	*
37	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	<	*       and "The Regents of the University of California" must
39	<	*       not be used to endorse or promote products derived from this
40	<	*       software without prior written permission. For written
41	<	*       permission, please contact [email protected].
42	<	*
43	<	* 5. Products derived from this software may not be called "Radiance",
44	<	*       nor may "Radiance" appear in their name, without prior written
45	<	*       permission of Lawrence Berkeley National Laboratory.
46	<	*
47	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	<	* SUCH DAMAGE.
59	<	* ====================================================================
60	<	*
61	<	* This software consists of voluntary contributions made by many
62	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63	<	* information on Lawrence Berkeley National Laboratory, please see
64	<	* <http://www.lbl.gov/>.
65	<	*/
10	>	#include "copyright.h"
11
12	+	#include <string.h>
13	+	#include <signal.h>
14	+	#include <sys/stat.h>
15	+
16	+	#include "rtprocess.h" /* getpid() */
17		#include "standard.h"
18	+	#include "platform.h"
19		#include "random.h"
20
21		#ifdef F_SETLKW
22		#include "paths.h"
23		#include "selcall.h"
73	–	#include <signal.h>
74	–	#include <sys/stat.h>
24
25		#ifndef TIMELIM
26		#define TIMELIM         (8*3600)        /* time limit for holding pattern */
27		#endif
28
80	–	#ifndef freebsd
81	–	#define mkfifo(fn,md)   mknod(fn, S_IFIFO|(md), 0)
82	–	#endif
83	–
29		extern void     io_process();
30
31		extern int      headismine;     /* boolean true if header belongs to me */
#	Line 140 | Line 85 | int    lf;
85		}
86
87
88	+	void
89		persistfile(pfn)        /* open persist file and lock it */
90		char    *pfn;
91		{
#	Line 191 | Line 137 | pfhold()               /* holding pattern for idle rendering proces
137		n = strlen(buf);
138		if (write(persistfd, buf, n) < n)
139		error(SYSTEM, "error writing persist file");
140	<	lseek(persistfd, (off_t)0L, 0);
140	>	lseek(persistfd, (off_t)0, SEEK_SET);
141		/* wait TIMELIM for someone to signal us */
142		got_io = 0;
143		signal(SIGIO, sig_io);
#	Line 259 | Line 205 | io_process()           /* just act as go-between for actual pro
205		}
206		if (nr < 0)
207		error(SYSTEM, "error reading persist file");
208	+	#ifndef _WIN32 /* XXX we need a replacement for that one */
209		ftruncate(persistfd, (off_t)0L);        /* truncate persist file */
210	+	#endif
211		pfdetach();                     /* close & release persist file */
212		buf[nr] = '\0';                 /* parse what we got */
213	<	if ((cp = index(buf, ' ')) == NULL)
213	>	if ((cp = strchr(buf, ' ')) == NULL)
214		goto formerr;
215		*cp++ = '\0';
216		if ((pid = atoi(cp)) <= 0)
217		goto formerr;
218	<	if ((cp = index(cp, '\n')) == NULL)
218	>	if ((cp = strchr(cp, '\n')) == NULL)
219		goto formerr;
220		pfin = ++cp;
221	<	if ((cp = index(cp, '\n')) == NULL)
221	>	if ((cp = strchr(cp, '\n')) == NULL)
222		goto formerr;
223		*cp++ = '\0';
224		pfout = cp;
225	<	if ((cp = index(cp, '\n')) == NULL)
225	>	if ((cp = strchr(cp, '\n')) == NULL)
226		goto formerr;
227		*cp++ = '\0';
228		pferr = cp;
229	<	if ((cp = index(cp, '\n')) == NULL)
229	>	if ((cp = strchr(cp, '\n')) == NULL)
230		goto formerr;
231		*cp++ = '\0';
232		if (cp-buf != nr)

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)