Revision: 54901
http://brlcad.svn.sourceforge.net/brlcad/?rev=54901&view=rev
Author: brlcad
Date: 2013-03-27 02:34:43 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
remove support for platforms that are no longer even remotely accessible (sgi
arguably is, but we should still compile there with gcc). remove
accommodations and references to cray, sgi/irix, and alliant
Modified Paths:
--------------
brlcad/trunk/include/rtgeom.h
brlcad/trunk/src/libbu/semaphore.c
brlcad/trunk/src/librt/roots.c
brlcad/trunk/src/librt/timer42.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/util/ttcp.c
Modified: brlcad/trunk/include/rtgeom.h
===================================================================
--- brlcad/trunk/include/rtgeom.h 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/include/rtgeom.h 2013-03-27 02:34:43 UTC (rev 54901)
@@ -44,8 +44,6 @@
__BEGIN_DECLS
-#undef r_a /* defined on alliant in <machine/reg.h> included in signal.h */
-
#define NAMELEN 16 /* NAMESIZE from db.h (can't call it NAMESIZE!!!!!) */
/*
Modified: brlcad/trunk/src/libbu/semaphore.c
===================================================================
--- brlcad/trunk/src/libbu/semaphore.c 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/src/libbu/semaphore.c 2013-03-27 02:34:43 UTC (rev 54901)
@@ -56,13 +56,11 @@
*/
#ifdef HAVE_PTHREAD_H
# include <pthread.h>
-# if !defined(sgi)
struct bu_semaphores {
uint32_t magic;
pthread_mutex_t mu;
};
# define DEFINED_BU_SEMAPHORES 1
-# endif
#endif
@@ -109,7 +107,7 @@
}
# endif
-# if defined(HAVE_PTHREAD_H) && !defined(sgi)
+# if defined(HAVE_PTHREAD_H)
for (i=0; i < nsemaphores; i++) {
bu_semaphores[i].magic = BU_SEMAPHORE_MAGIC;
if (pthread_mutex_init(&bu_semaphores[i].mu, NULL)) {
@@ -198,7 +196,7 @@
bu_bomb("fatal semaphore acquisition failure");
}
# endif
-# if defined(HAVE_PTHREAD_H) && !defined(sgi)
+# if defined(HAVE_PTHREAD_H)
if (pthread_mutex_lock(&bu_semaphores[i].mu)) {
fprintf(stderr, "bu_semaphore_acquire(): pthread_mutex_lock() failed on
[%d]\n", i);
bu_bomb("fatal semaphore acquisition failure");
@@ -247,7 +245,7 @@
bu_bomb("fatal semaphore acquisition failure");
}
# endif
-# if defined(HAVE_PTHREAD_H) && !defined (sgi)
+# if defined(HAVE_PTHREAD_H)
if (pthread_mutex_unlock(&bu_semaphores[i].mu)) {
fprintf(stderr, "bu_semaphore_acquire(): pthread_mutex_unlock() failed
on [%d]\n", i);
bu_bomb("fatal semaphore acquisition failure");
Modified: brlcad/trunk/src/librt/roots.c
===================================================================
--- brlcad/trunk/src/librt/roots.c 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/src/librt/roots.c 2013-03-27 02:34:43 UTC (rev 54901)
@@ -145,9 +145,6 @@
* termination conditions somewhat.
*
* diff is |p0|**2. nxZ = Z - p0.
- *
- * SGI XNS IRIS 3.5 compiler fails if following 2 assignments
- * are embedded in the IF statement, as before.
*/
b = bn_cx_amplsq(nxZ);
diff = bn_cx_amplsq(&p0);
Modified: brlcad/trunk/src/librt/timer42.c
===================================================================
--- brlcad/trunk/src/librt/timer42.c 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/src/librt/timer42.c 2013-03-27 02:34:43 UTC (rev 54901)
@@ -206,7 +206,7 @@
i = l;
bu_vls_printf(vp, "%d", i / 60);
}
- i = i % 60; /* GSM: bug in Alliant CE optimization prohibits "%=" here */
+ i = i % 60;
bu_vls_printf(vp, ":%d%d", i / 10, i % 10);
}
Modified: brlcad/trunk/src/rt/do.c
===================================================================
--- brlcad/trunk/src/rt/do.c 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/src/rt/do.c 2013-03-27 02:34:43 UTC (rev 54901)
@@ -867,16 +867,10 @@
if (R_DEBUG&RDEBUG_RTMEM)
bu_debug &= ~BU_DEBUG_MEM_LOG;
- /*
- * Certain parallel systems (e.g., Alliant) count the entire
- * multi-processor complex as one computer, and charge only once.
- * This matches the desired behavior here. Other vendors (e.g.,
- * SGI) count each processor separately, and charge for all of
- * them. These results need to be normalized. Otherwise, all we
- * would know is that a given workload takes about the same amount
- * of CPU time, regardless of the number of CPUs.
+ /* These results need to be normalized. Otherwise, all we would
+ * know is that a given workload takes about the same amount of
+ * CPU time, regardless of the number of CPUs.
*/
-#if !defined(alliant)
if (npsw > 1) {
int avail_cpus;
int ncpus;
@@ -888,9 +882,9 @@
ncpus = npsw;
}
nutime = utime / ncpus; /* compensate */
- } else
-#endif
+ } else {
nutime = utime;
+ }
/* prevent a bogus near-zero time to prevent infinite and
* near-infinite results without relying on IEEE floating point
Modified: brlcad/trunk/src/util/ttcp.c
===================================================================
--- brlcad/trunk/src/util/ttcp.c 2013-03-27 02:30:45 UTC (rev 54900)
+++ brlcad/trunk/src/util/ttcp.c 2013-03-27 02:34:43 UTC (rev 54901)
@@ -544,22 +544,13 @@
if (atoi(host) > 0) {
/* Numeric */
sinhim.sin_family = AF_INET;
-#ifdef cray
- addr_tmp = inet_addr(host);
- sinhim.sin_addr = addr_tmp;
-#else
sinhim.sin_addr.s_addr = inet_addr(host);
-#endif
} else {
if ((addr=(struct hostent *)gethostbyname(host)) == NULL)
err("bad hostname");
sinhim.sin_family = addr->h_addrtype;
memcpy((char*)&addr_tmp, addr->h_addr, addr->h_length);
-#ifdef cray
- sinhim.sin_addr = addr_tmp;
-#else
sinhim.sin_addr.s_addr = addr_tmp;
-#endif /* cray */
}
sinhim.sin_port = htons(port);
sinme.sin_port = 0; /* free choice */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
