File: upstream-parallelization-surface.patch

package info (click to toggle)
surf-alggeo 1.0.6%2Bds-6
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 3,980 kB
  • sloc: cpp: 22,587; yacc: 1,049; makefile: 520; lex: 327; ansic: 237; sh: 95
file content (563 lines) | stat: -rw-r--r-- 17,632 bytes parent folder | download | duplicates (6)
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
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
Description: upstream: parallelization: surface
 Attempt to parallelize surface drawing (surface without cuts for now);
 implemented on behalf of imaginary.org by Jerome Benoit <calculus@rezozer.net>.
Origin: imaginary.org
Forwarded: submitted
Author:
 Jerome Benoit <calculus@rezozer.net>
Last-Update: 2016-08-02

--- a/yaccsrc/Script.cc
+++ b/yaccsrc/Script.cc
@@ -35,6 +35,13 @@
  **************************************************************************/
 
 
+#define ENABLE_PARALLELIZATION_SURFACE
+
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+#define ENABLE_PARALLELIZATION_SURFACE_PTHREAD
+#endif
+
+
 #include <assert.h>
 #include <stdio.h>
 #include <errno.h>
@@ -44,6 +51,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE_PTHREAD
+#include <pthread.h>
+#endif
+
 #include "FileWriter.h"
 #include "TreePolynom.h"
 #include "Misc.h"
@@ -80,6 +91,12 @@
 // #define DEBUG
 #include "debug.h"
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+#	ifndef SURFALGGEO_ENVIRONMENT_NPROCESSORS
+#	define SURFALGGEO_ENVIRONMENT_NPROCESSORS "SURFALGGEO_NPROCESSORS"
+#	endif
+#endif
+
 using namespace std;
 
 TSDrawingArea	*Script::display	= 0;
@@ -104,7 +121,7 @@
 	} else {
 		DMESS("adding new command " << name);
 	}
-	
+
 	symtab_add_surface_name (name, SYM_COMMAND, 1, (void*)func);
 }
 
@@ -396,21 +413,204 @@
 	checkVariables();
 
 	BEGIN("Script::setSize");
-	if(buffer->getWidth() != main_width_data ||
-	   buffer->getHeight() != main_height_data) {
+	if(buffer->getWidth() != main_width_data || buffer->getHeight() != main_height_data) {
 		buffer->Realloc(main_width_data, main_height_data);
 		if (display) {
 			display->setSize(main_width_data, main_height_data);
 		}
-		buffer->Realloc(main_width_data, main_height_data);
+		//buffer->Realloc(main_width_data, main_height_data);
 	}
 }
 
 
 extern double Y_AXIS_LR_ROTATE;
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+static size_t Script_Tile_sys_numberof_processors(void) {
+	char * env_nprocessors=getenv(SURFALGGEO_ENVIRONMENT_NPROCESSORS);
+	size_t numberof_processor=1;
+
+	if (env_nprocessors) {
+		long int long_numberof_processor=strtol(env_nprocessors,NULL,0);
+		if (long_numberof_processor < 0) {
+			long_numberof_processor=-long_numberof_processor;
+		}
+		else {
+			const long int long_max_numberof_processor=4L*sysconf(_SC_NPROCESSORS_CONF);
+			if (long_max_numberof_processor < long_numberof_processor) {
+				long_numberof_processor=long_max_numberof_processor;
+			}
+		}
+		numberof_processor=(long_numberof_processor<2)?1:(size_t)(long_numberof_processor);
+	}
+	else {
+		long int long_numberof_processor=sysconf(_SC_NPROCESSORS_ONLN);
+		double nloadavg[3]={0.0,0.0,0.0};
+
+		if (getloadavg(nloadavg,3) == 3) {
+			double one_over_numberof_processor=1.0/(double)(long_numberof_processor);
+			nloadavg[0] *= one_over_numberof_processor;
+			nloadavg[1] *= one_over_numberof_processor;
+			nloadavg[2] *= one_over_numberof_processor;
+			if (2.5 < (nloadavg[1])) {
+				long_numberof_processor = 1L;
+				}
+			else if ((1.75 < nloadavg[1]) || (2.5 < nloadavg[0])) {
+				long_numberof_processor /= 2L;
+				}
+		}
+		numberof_processor=(long_numberof_processor<2)?1:(size_t)(long_numberof_processor);
+	}
+
+	return numberof_processor;
+}
+
+typedef struct {
+	size_t cardinality;
+	size_t tilingWidth;
+	size_t tilingHeight;
+	int tileWidth;
+	int tileHeight;
+	int areaHorizontalLowerBound;
+	int areaVerticalLowerBound;
+	int areaHorizontalUpperBound;
+	int areaVerticalUpperBound;
+	} Script_Tile_tiling_tuple;
+
+static bool Script_Tile_tiling_compute(size_t cardinality, int xmin, int ymin, int xmax, int ymax, Script_Tile_tiling_tuple *tuple)
+{
+	bool answer = false;
+	if ((tuple) /* && (xmin<xmax) && (ymin<ymax) */) {
+		if (1<cardinality) {
+			const int tile_delta = 67;
+			const int tile_4_3_delta = (4*tile_delta)/3; // 1/3 satisfies (1+epsilon)/2 = (1-epsilon)
+			int tile_cardinal = INT_MAX;
+			int tile_xcardinal = INT_MAX;
+			int tile_ycardinal = INT_MAX;
+			int tile_xdiff = INT_MAX;
+			int tile_ydiff = INT_MAX;
+			int tile_xtile = 0;
+			int tile_ytile = 0;
+			int tile_xmin = INT_MIN;
+			int tile_ymin = INT_MIN;
+			int tile_xmax = INT_MAX;
+			int tile_ymax = INT_MAX;
+			int tile_xstep = SHRT_MAX;
+			int tile_ystep = SHRT_MAX;
+			int xtile, ytile;
+
+			tile_cardinal = (int)(cardinality);
+			tile_xdiff = xmax - xmin;
+			tile_ydiff = ymax - ymin;
+
+			if (tile_4_3_delta < tile_xdiff) {
+				if (tile_4_3_delta < tile_ydiff) { // quadratic tiling
+					tile_xcardinal = (int) ( floor ( sqrt (tile_cardinal) ) );
+					tile_ycardinal = tile_cardinal / tile_xcardinal;
+					// (tile_xcardinal <= tile_ycardinal)
+					if (tile_xdiff <= tile_ydiff) { // square or vertical rectangle
+						tile_xtile = MAX(2, tile_xdiff / tile_delta);
+						tile_ytile = MAX(2, tile_ydiff / tile_delta);
+						if (tile_xcardinal <= tile_xtile)
+							tile_xtile = tile_xcardinal;
+						else {
+							tile_ycardinal = tile_cardinal / tile_xtile;
+							//tile_xcardinal = tile_xtile;
+						}
+						if (tile_ycardinal < tile_ytile)
+							tile_ytile = tile_ycardinal;
+					}
+					else { // (tile_ydiff < tile_xdiff) // horizontal rectangle
+						if (tile_xcardinal < tile_ycardinal) {
+							xtile = tile_ycardinal; tile_ycardinal = tile_xcardinal; tile_xcardinal = xtile;
+						} // (tile_ytile <= tile_xtile)
+						tile_ytile = MAX(2, tile_ydiff / tile_delta);
+						tile_xtile = MAX(2, tile_xdiff / tile_delta);
+						if (tile_ycardinal <= tile_ytile)
+							tile_ytile = tile_ycardinal;
+						else {
+							tile_xcardinal = tile_cardinal / tile_ytile;
+							//tile_ycardinal = tile_ytile;
+						}
+						if (tile_xcardinal < tile_xtile)
+							tile_xtile = tile_xcardinal;
+					}
+				}
+				else { // horizontal linear tiling
+					tile_ytile = 1;
+					tile_xtile = MAX(2, tile_xdiff / tile_delta);
+					if (tile_cardinal < tile_xtile) tile_xtile = tile_cardinal;
+				}
+			}
+			else if (tile_4_3_delta < tile_ydiff) { // vertical linear tiling
+				tile_xtile = 1;
+				tile_ytile = MAX(2, tile_ydiff / tile_delta);
+				if (tile_cardinal < tile_ytile) tile_ytile = tile_cardinal;
+			}
+			else { // scalar tiling
+				tile_ytile = tile_xtile = 1;
+			}
+
+			tile_cardinal = tile_xtile * tile_ytile;
+			tile_xstep = tile_xdiff / tile_xtile;
+			tile_ystep = tile_ydiff / tile_ytile;
+
+			tuple->cardinality = (size_t)(tile_cardinal);
+			tuple->tilingWidth = (size_t)(tile_xtile);
+			tuple->tilingHeight = (size_t)(tile_ytile);
+			tuple->tileWidth = tile_xstep;
+			tuple->tileHeight = tile_ystep;
+			tuple->areaHorizontalLowerBound = xmin;
+			tuple->areaVerticalLowerBound = ymin;
+			tuple->areaHorizontalUpperBound = xmax;
+			tuple->areaVerticalUpperBound = ymax;
+
+			answer = (1<tile_cardinal)?true:false;
+		}
+		else {
+			tuple->cardinality = 1;
+			tuple->tilingWidth = 1;
+			tuple->tilingHeight = 1;
+			tuple->tileWidth = xmax - xmin;
+			tuple->tileHeight = ymax -ymin;
+			tuple->areaHorizontalLowerBound = xmin;
+			tuple->areaVerticalLowerBound = ymin;
+			tuple->areaHorizontalUpperBound = xmax;
+			tuple->areaVerticalUpperBound = ymax;
+			//answer = false;
+		}
+	}
+	return answer;
+}
+
+typedef struct {
+	size_t tdx;
+	SurfaceCalc *sc;
+	int xmin;
+	int ymin;
+	int xmax;
+	int ymax;
+	RgbBuffer *buffer;
+	bool wipedOff;
+	} Script_Tile_tile_tuple;
+
+static void * Script_Tile_tile_tile(void * tuple)
+{
+	Script_Tile_tile_tuple * tile_tuple = (Script_Tile_tile_tuple *)(tuple);
+	SurfaceCalc * sc = tile_tuple->sc;
+	if (tile_tuple->wipedOff) sc->wipeOff(); else tile_tuple->wipedOff = false;
+	(sc->surface_calculate)( tile_tuple->xmin, tile_tuple->ymin, tile_tuple->xmax, tile_tuple->ymax, *(tile_tuple->buffer));
+	pthread_exit(NULL);
+	return NULL;
+}
+
+#endif
+
 void Script::drawSurface()
 {
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+	bool flag_multithreading = false;
+#endif
 	int xmin, ymin;
 	int xmax, ymax;
 	checkVariables();
@@ -437,12 +637,99 @@
 
 	Y_AXIS_LR_ROTATE = 0.0;
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+
+	Script_Tile_tiling_tuple tiling_tuple;
+
+	flag_multithreading = Script_Tile_tiling_compute(Script_Tile_sys_numberof_processors(), xmin, ymin, xmax, ymax, &tiling_tuple);
+
+#ifdef ENABLE_PARALLELIZATION_SURFACE_PTHREAD
+	pthread_t listof_thread[tiling_tuple.cardinality];
+#endif
+	SurfaceCalc *arrayof_sc = new SurfaceCalc [tiling_tuple.cardinality];
+	Script_Tile_tile_tuple listof_tile_tuple[tiling_tuple.cardinality];
+	Script_Tile_tile_tuple * tile_tuple = NULL;
+	size_t tdx = 0;
+
+//	#pragma omp parallel shared(arrayof_sc)
+//	#pragma omp parallel shared(listof_tile_tuple)
+
+	if (flag_multithreading) {
+
+#define PROCNAME_SURFACECALCULATE(XTile,YTile,TileXmin,TileYmin,TileXmax,TileYmax) \
+	/* fprintf(stderr, \
+			"::::: DEBUG:%s:%s:%d:\t<%2zu/%zu>\t[%2zu/%zu,%2zu/%zu] (%4i,%4i) (%4i,%4i)\n", \
+		__FILE__,__func__,__LINE__, \
+		(tdx + 1), tiling_tuple.cardinality, \
+		XTile, tile_xtile, YTile, tile_ytile, \
+		TileXmin, TileYmin, TileXmax, TileYmax \
+		); */ \
+	tile_tuple = listof_tile_tuple + tdx; \
+	tile_tuple->tdx = tdx; \
+	tile_tuple->sc = arrayof_sc + tdx; \
+	(tile_tuple->sc)->setDisplay (getDisplay()); \
+	(tile_tuple->sc)->setPreview (getPreview()); \
+	tile_tuple->xmin = TileXmin; tile_tuple->ymin = TileYmin; \
+	tile_tuple->xmax = TileXmax; tile_tuple->ymax = TileYmax; \
+	tile_tuple->buffer = intensity; \
+	tile_tuple->wipedOff = true; \
+	++tdx;
+
+		{ // WIP: might be macrofied
+			const size_t tile_xtile = tiling_tuple.tilingWidth;
+			const size_t tile_ytile = tiling_tuple.tilingHeight;
+			const int tile_xstep = tiling_tuple.tileWidth;
+			const int tile_ystep = tiling_tuple.tileHeight;
+			int tile_xmin = INT_MAX;
+			int tile_ymin = INT_MAX;
+			int tile_xmax = INT_MIN;
+			int tile_ymax = INT_MIN;
+			size_t xtile = 0;
+			size_t ytile = 0;
+			for( ytile=1, tile_ymin=ymin, tile_ymax=tile_ymin+tile_ystep; ytile<tile_ytile; tile_ymin=tile_ymax,tile_ymax+=tile_ystep,++ytile) {
+				for( xtile=1, tile_xmin=xmin, tile_xmax=tile_xmin+tile_xstep; xtile<tile_xtile; tile_xmin=tile_xmax,tile_xmax+=tile_xstep,++xtile) {
+					PROCNAME_SURFACECALCULATE(xtile, ytile, tile_xmin, tile_ymin, tile_xmax, tile_ymax);
+				}
+				PROCNAME_SURFACECALCULATE(xtile, ytile, tile_xmin, tile_ymin, xmax, tile_ymax);
+			}
+			for( xtile=1, tile_xmin=xmin, tile_xmax=tile_xmin+tile_xstep; xtile<tile_xtile; tile_xmin=tile_xmax,tile_xmax+=tile_xstep,++xtile) {
+				PROCNAME_SURFACECALCULATE(xtile, ytile, tile_xmin, tile_ymin, tile_xmax, ymax);
+			}
+			PROCNAME_SURFACECALCULATE(xtile, ytile, tile_xmin, tile_ymin, xmax, ymax);
+		}
+
+#ifdef ENABLE_PARALLELIZATION_SURFACE_PTHREAD
+		for (tdx=0,tile_tuple=listof_tile_tuple;tdx<tiling_tuple.cardinality;++tdx,++tile_tuple) {
+			pthread_create(&listof_thread[tdx],NULL,Script_Tile_tile_tile,(void *)(tile_tuple));
+		}
+		for (tdx=0;tdx<tiling_tuple.cardinality;++tdx) {
+			pthread_join(listof_thread[tdx],NULL);
+		}
+#else
+		for (tdx=0,tile_tuple=listof_tile_tuple;tdx<tiling_tuple.cardinality;++tdx,++tile_tuple) {
+			(tile_tuple->sc->surface_calculate)( tile_tuple->xmin, tile_tuple->ymin, tile_tuple->xmax, tile_tuple->ymax, *intensity);
+		}
+#endif
+
+#undef PROCNAME_SURFACECALCULATE
+	}
+	else {
+		(arrayof_sc->setDisplay)(getDisplay());
+		(arrayof_sc->setPreview)(getPreview());
+		(arrayof_sc->surface_calculate)(xmin, ymin, xmax, ymax, *intensity);
+	}
+
+#else
 	SurfaceCalc sc;
 	sc.setDisplay (getDisplay());
 	sc.setPreview (getPreview());
+#endif
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+#else
 	//sc.wipeOff();
 	sc.surface_calculate(xmin, ymin, xmax, ymax, *intensity);
+#endif
 
 	if( display_numeric.stereo_eye ) {
 
@@ -450,8 +737,28 @@
 		*getZBuffer3d() = -10.0;
 		intensity->StereoLeft();
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+	if (flag_multithreading) {
+#ifdef ENABLE_PARALLELIZATION_SURFACE_PTHREAD
+		for (tdx=0,tile_tuple=listof_tile_tuple;tdx<tiling_tuple.cardinality;++tdx,++tile_tuple) {
+			pthread_create(&listof_thread[tdx],NULL,Script_Tile_tile_tile,(void *)(tile_tuple));
+			}
+		for (tdx=0;tdx<tiling_tuple.cardinality;++tdx) {
+			pthread_join(listof_thread[tdx],NULL);
+		}
+#else
+		for (tdx=0,tile_tuple=listof_tile_tuple;tdx<tiling_tuple.cardinality;++tdx,++tile_tuple) {
+			(tile_tuple->sc->surface_calculate)( tile_tuple->xmin, tile_tuple->ymin, tile_tuple->xmax, tile_tuple->ymax, *(tile_tuple->buffer));
+		}
+#endif
+	}
+	else {
+		(arrayof_sc->surface_calculate)(xmin, ymin, xmax, ymax, *intensity);
+	}
+#else
 		sc.wipeOff();
 		sc.surface_calculate(xmin, ymin, xmax, ymax, *intensity);
+#endif
 
 		int     back =(int)( 0.299*((float)(color_background_data[RED]))
 				     +0.587*((float)(color_background_data[GREEN]))
@@ -469,6 +776,10 @@
 			getDisplay()->drawRgbBuffer (*intensity);
 	}
 
+#ifdef ENABLE_PARALLELIZATION_SURFACE
+	delete[] arrayof_sc;
+#endif
+
 }
 
 
--- a/src/cube.h
+++ b/src/cube.h
@@ -50,7 +50,7 @@
 	double    equations[6][4];
 } cube;
 
-extern  cube    clip_cube;
+extern  cube    GLOBAL_clip_cube;
 
 void    init_cube( cube* );
 
--- a/src/cube.cc
+++ b/src/cube.cc
@@ -50,7 +50,7 @@
 //  global data
 // -------------
 
-cube    clip_cube;
+cube    GLOBAL_clip_cube;
 
 // -----------------------------------
 //  rotate the cube around the x-axis
--- a/src/SurfaceDataStruct.h
+++ b/src/SurfaceDataStruct.h
@@ -84,7 +84,6 @@
 	int    root_n_all;  /* sk Anzahl aller vorhandenen NUS aller Flchen*/        
 	bool   init_all;    /* sk wurde berhaupt eine Flche initialisiert*/
 
-
 };
 
 #endif
--- a/src/SurfaceDataStruct.cc
+++ b/src/SurfaceDataStruct.cc
@@ -73,7 +73,7 @@
 	//  init clipping_cube
 	// --------------------
 	
-	init_cube( &clip_cube );
+//	init_cube( &GLOBAL_clip_cube );
 
 	surf_n=k;
 	init_all = k > 0;
--- a/draw/SurfaceCalc.cc
+++ b/draw/SurfaceCalc.cc
@@ -182,7 +182,8 @@
 							zero_of_polyx( &sf_ds.formulas[i].hpxyz->pZ,
 								       zmax,zmin,root[i],			
 								       root_last_pixel[i],root_last_pixel_n[i],
-                                                                       clipper );
+                       clipper,
+											 flag_numeric_multi_root );
 						sf_ds.root_n_all += sf_ds.surfaces[i].root_n;
 						root_last_pixel_n[i] = sf_ds.surfaces[i].root_n;     
 					} 
@@ -442,7 +443,7 @@
 										&sf_ds.formulas[i].hpxyz->pZ,
 										zmax,zmin,root[i],
 										root_last_pixel[i],
-										root_last_pixel_n[i],clipper );
+										root_last_pixel_n[i],clipper,flag_numeric_multi_root );
 								    sf_ds.root_n_all+=sf_ds.surfaces[i].root_n;
 								    root_last_pixel_n[i] = sf_ds.surfaces[i].root_n;
 								} 
@@ -836,8 +837,7 @@
 					   double stepwidth,
 					   colorrgb& color_intens ) 		
 {
-	// FIXME
-	static    int     inside;         // true if normal points into monitor
+	int     inside;         // true if normal points into monitor
 
 	Vector  P;              // our point on the surface
 	Vector  N;              // the surface normal in P
@@ -1148,7 +1148,7 @@
 							&sf_ds.formulas[i].hpxyz->pZ,	
 							zmax,zmin,root[i],			
 							root_last_pixel[i],
-							root_last_pixel_n[i],clipper );
+							root_last_pixel_n[i],clipper,flag_numeric_multi_root );
 						sf_ds.root_n_all += sf_ds.surfaces[i].root_n; 	
 						root_last_pixel_n[i] = sf_ds.surfaces[i].root_n;
 					}
@@ -1325,14 +1325,14 @@
 	packLights( ); 
 	
 	// ------------------------
-	//  illumiation components
+	//  illumination components
 	// ------------------------
 	flag_ambient      = light_illumination_data & light_illumination_ambient_data;
 	flag_diffuse      = light_illumination_data & light_illumination_diffuse_data;
 	flag_reflected    = light_illumination_data & light_illumination_reflected_data;
 	flag_transmitted  = light_illumination_data & light_illumination_transmitted_data;
 	
-	numeric_multi_root = flag_transmitted;
+	flag_numeric_multi_root = flag_transmitted;
 	
 	part_A= (float)(((double)(light_settings[0].ambient))/100.0);
 		
--- a/draw/SurfaceCalc.h
+++ b/draw/SurfaceCalc.h
@@ -137,11 +137,13 @@
 	int      flag_reflected;
 	int      flag_transmitted;
 
+	int      flag_numeric_multi_root;
+
 	float    ambient[3][3];   	// sk :1'ten 3 definiert RGB, ...
 	float    diffuse[3][3];   	//     2'ten 3 surfs,inside,balls
 	float    tocolor[3];            // sk :Farbe des Farbverlaufs
 
-	double   reflected;       			
+	double   reflected;
 	double   transmitted;
 	int      thickness;
 	double   transmission;
--- a/src/roots.h
+++ b/src/roots.h
@@ -41,9 +41,8 @@
 //  Function protoytpes
 // ----------------------------------------------------------------------------
 
-extern int numeric_multi_root;
 class polyx;
-int     zero_of_polyx( polyx*,double,double,double*,double*,int,NewClip* );
+int zero_of_polyx( polyx*,double,double,double*,double*,int,NewClip*,int );
 
 #endif  /* ROOTS_H */
 
--- a/src/roots.cc
+++ b/src/roots.cc
@@ -47,9 +47,6 @@
 #include "gui_config.h"
 #include "NewClip.h"
 
-//  using namespace globals;
-int numeric_multi_root = 0;
-
 // ----------------------------------------------------------------------------
 //  compute roots of f in [zmin,zmax] where g is positive
 //      f:           polynomial
@@ -63,11 +60,12 @@
 //      numeric_root_finder_data: chooses method
 // ----------------------------------------------------------------------------
 
-int     zero_of_polyx( polyx *f,
+int zero_of_polyx( polyx *f,
                 double zmax,double zmin,
                 double *root,
                 double *root_old,int old_n,
-                NewClip *clipper )
+                NewClip *clipper,
+								int numeric_multi_root)
 {