1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313
|
diff -rc old/Makefile new/Makefile
*** old/Makefile Tue Oct 2 19:22:43 1990
--- new/Makefile Tue Oct 2 19:24:18 1990
***************
*** 7,13 ****
#
###########################################################################
! # Makefile generated from "Imake.tmpl" and </tmp/IIf.a02029>
# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
#
# Platform-specific parameters may be set in the appropriate .cf
--- 7,13 ----
#
###########################################################################
! # Makefile generated from "Imake.tmpl" and </tmp/IIf.a01700>
# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $
#
# Platform-specific parameters may be set in the appropriate .cf
***************
*** 225,231 ****
###########################################################################
# start of Imakefile
! # SCCS ID : %W% %G%
#
# Imakefile - Imakefile for xengine
#
--- 225,231 ----
###########################################################################
# start of Imakefile
! # SCCS ID : @(#)Imakefile 1.1 9/12/90
#
# Imakefile - Imakefile for xengine
#
diff -rc old/README new/README
*** old/README Tue Oct 2 19:22:44 1990
--- new/README Tue Oct 2 19:23:16 1990
***************
*** 31,65 ****
70 120 PolyFillRectangle
71 100 PolyFillArc
! --- Benchmarks **
! Machine Server Release rpm
-----------------------------------------------------------------------------
SparcStation 370 Memory 56M X11R4(fix-14),256 color 230
SparcStation 1 X11R4(applied fix-14) 256 color 186.33
luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1
! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90
Sun 3/60C X11R4 no-fix 73.3
CIT-X Terminal X11R3 mono 45.5
X-mint Memory 8M X11R3,mono 45
X-station Memory 8M X11R3,256 color 40
NEWS841 memory 16M X11R2, 16 color 11
X640 X11R3?(mono) 10.4
MASSCOMP RTU X11R2? 16 color 8.5
! *1 beta version OS(MACH).
! ** These rpm are *not* official. If you want exact server's performance,
! use other benchmark tools (such as xperf or xtest).
! --- Special thanks to:
!
! Yasushi Ohba(YAMAHA/ISL) Mathematical suggestion.
! Toshihisa Sadakata(YAMAHA/ISL) Engine movement suggestion.
! Susumu Mukawa (NTT) Benchmark data correction.
! Kazunari "ISSEY" Nakamura (NKK) Benchmark data correction.
Send any comments, bug reports, etc. are welcome.
--- 31,99 ----
70 120 PolyFillRectangle
71 100 PolyFillArc
+ --- Special thanks to:
! Yasushi Ohba (YAMAHA/ISL)
! Mathematical.
! Toshihisa Sadakata (YAMAHA/ISL)
! Engine movement.
! Hitoshi Tsujimura <hitosi@sinbasi.trad.pfu.fujitsu.co.jp>
! Bug report & fix.
!
! --- Benchmarks
!
! xengine benchmark
!
! Thanks to :
!
! "Greg Onufer" <greg@cheers.Bungi.COM>
! Kazunari "ISSEY" Nakamura <kazu@the.nkk.co.jp>
! Susumu-Mukawa <mukawa@ctec.tn-sec.ntt.jp>
! kaneyasu@src.ricoh.co.jp (Noriyuki Kaneyasu)
! palm@icrl.mew.mei.co.jp (Steve [kiwin] Palm)
! saitoh@icsts1.osaka-u.ac.jp (SAITOH Akinori)
! sato@rokoh.gen.u-tokyo.ac.jp (Keisuke (@_@) SATO)
! take@studiogen.co.jp (Wataru Takenouchi)
!
! Machine Server RPM
-----------------------------------------------------------------------------
+ DEC Station 3100 X11R4(fix-?),mono 539 *4
+ DEC Station 5000/200 16M X11R4(fix-14),256 color 473
+ Sun4/370GXP SPARC 16MHz(?) X11R4(fix-12),mono 438
+ SparcStation 470 Memory 32M X11R4(fix-14),256color (GX) 301.8
+ DEC Station 3100/200 16M X11R4(fix-14),256 color 248 ~ 268
+ SparcStation IPC Memory 24M X11R4(fix-6), 256 color 234
SparcStation 370 Memory 56M X11R4(fix-14),256 color 230
+ Sun4c/60GX 10MHz(?) X11R4(fix-12),256 color 200
SparcStation 1 X11R4(applied fix-14) 256 color 186.33
luna-88K,2 CPU,mach Memory 32M X11R4, 16 color 180 *1
! Sun4/260C 10MHz(?) X11R4(fix-12), 256 color 155
! Sun3/50M 12M X11R4(fix-14+local patch)mono 136 *3
! Sun3/150M 16MHz X11R4(fix-12), mono 132
! Sun 3/60C(CG4) X11R4 fix-14 gcc-1.35.1 16color about 90
! Sun3/110LC 16MHz X11R4(fix-12),256 color 75
Sun 3/60C X11R4 no-fix 73.3
CIT-X Terminal X11R3 mono 45.5
+ NWS-1750 + XMiNT X11R3? mono 46 ~ 48
X-mint Memory 8M X11R3,mono 45
X-station Memory 8M X11R3,256 color 40
+ Sun-2/120,7M X11R4(fix-14),gcc-1.37.1,mono 21.6
NEWS841 memory 16M X11R2, 16 color 11
X640 X11R3?(mono) 10.4
+ NWS1450 (color) ?? 10 *2
MASSCOMP RTU X11R2? 16 color 8.5
+ PC-Xview 386sx 16MHz Memory 4M
+ 16bitBUS-VGA X11R3 3.5
! *1 OS is Beta version.
! *2 Why slow?
! *3 Local optimize was applied to server.
+ *4 Very fast !
+
Send any comments, bug reports, etc. are welcome.
***************
*** 68,71 ****
--- 102,111 ----
InSoft System Lab.
YAMAHA Corp.
shutoh@isl.yamama.co.jp
+
+
+
+
+
+
diff -rc old/patchlevel.h new/patchlevel.h
*** old/patchlevel.h Tue Oct 2 19:22:44 1990
--- new/patchlevel.h Tue Oct 2 19:21:52 1990
***************
*** 1,2 ****
! #define PATCHLEVEL 0
--- 1,3 ----
! #define PATCHLEVEL 1
!
diff -rc old/xengine.c new/xengine.c
*** old/xengine.c Tue Oct 2 19:22:45 1990
--- new/xengine.c Tue Oct 2 19:21:52 1990
***************
*** 1,4 ****
! static char sccsid[] = "@(#)xengine.c 1.9 9/19/90";
/*
* xengine - reciprocating engine for X :-)
--- 1,4 ----
! static char sccsid[] = "@(#)xengine.c 1.10 10/2/90";
/*
* xengine - reciprocating engine for X :-)
***************
*** 119,167 ****
/* Get graphic context */
gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[0], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel);
gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[1], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel);
XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter);
gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[2], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel);
gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[3], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel);
gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[4], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel);
gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[5], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel);
gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[6], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel);
gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormap(XtDisplay(engine), 0), colors[7], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel);
/* Create engine Pixmap */
! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0));
/* Interval timer start */
XtAddTimeOut(1, Cycle, NULL);
--- 119,168 ----
/* Get graphic context */
gcPiston = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[0], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcPiston, srcColor.pixel);
gcShaft = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[1], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcShaft, srcColor.pixel);
XSetLineAttributes(XtDisplay(engine), gcShaft, 2, LineSolid, CapButt, JoinMiter);
gcCylinder = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XSetGraphicsExposures(XtDisplay(engine), gcCylinder, False);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[2], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcCylinder, srcColor.pixel);
gcRoter = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[3], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcRoter, srcColor.pixel);
gcBack = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[4], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcBack, srcColor.pixel);
gcDep = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[5], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcDep, srcColor.pixel);
gcPre = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[6], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcPre, srcColor.pixel);
gcEngine = XCreateGC(XtDisplay(engine), XtWindow(engine), (unsigned long) 0, NULL);
! XAllocNamedColor(XtDisplay(engine), DefaultColormapOfScreen(XtScreen(engine)), colors[7], &srcColor, &dummyColor);
XSetForeground(XtDisplay(engine), gcEngine, srcColor.pixel);
/* Create engine Pixmap */
! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine)));
/* Interval timer start */
XtAddTimeOut(1, Cycle, NULL);
***************
*** 187,193 ****
height = args[1].value;
XFreePixmap(XtDisplay(engine), enginePixmap);
! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepth(XtDisplay(engine), 0));
}
--- 188,194 ----
height = args[1].value;
XFreePixmap(XtDisplay(engine), enginePixmap);
! enginePixmap = XCreatePixmap(XtDisplay(engine), XtWindow(engine), width, height, DefaultDepthOfScreen(XtScreen(engine)));
}
***************
*** 331,334 ****
--- 332,337 ----
return (cycle);
}
+
+
|