v2.6 +multi-threading

Author: soofsayer

CHANGELOG

@@ -1,5 +1,11 @@
 SIGNAL SERVER CHANGELOG 
 
+2.6 - 9 June 2015
+Multithreading support added by Michael Ramnarine
+PlotPropagation() and PlotLOSMap() use four threads by default
+Feature can be disabled with -nothreads flag
+Static and global variables have been made threadsafe
+
 2.5 - 27 May 2015
 Code refactored by Andrew Clayton / ac000 with header files
 New Makefile with c / c++ multi mode compilation

Makefile

@@ -4,7 +4,7 @@ CC		= gcc
 CXX		= g++
 CFLAGS		= -Wall -O3 -s -ffast-amth
 CXXFLAGS	= -Wall -O3 -s -ffast-math
-LIBS		= -lm
+LIBS		= -lm -lpthread
 
 VPATH		= models
 objects 	= main.o cost.o ecc33.o ericsson.o fspl.o hata.o itwom3.0.o \

README.md

@@ -20,7 +20,7 @@
 *                                                                            *
 \****************************************************************************/
 
-		 -- Signal Server 2.5 --
+		 -- Signal Server 2.6 --
 	Compiled for 64 tiles at 1200 pixels/degree
 
      -d Directory containing .sdf tiles
@@ -52,4 +52,6 @@
      -ked Knife edge diffraction (Default for ITM)
      -ng Normalise Path Profile graph
      -haf Halve 1 or 2 (optional)
+     -nothreads Turn off threaded processing (optional)
+
 

common.h

@@ -98,7 +98,7 @@ extern double clutter;
 extern double dBm;
 extern double loss;
 extern double field_strength;
-extern double *elev;
+extern __thread double *elev;
 
 extern char string[];
 extern char sdf_path[];
@@ -110,7 +110,7 @@ extern unsigned char metric;
 extern unsigned char dbm;
 
 extern struct dem *dem;
-extern struct path path;
+extern __thread struct path path;
 extern struct LR LR;
 extern struct region region;
 

main.cc

@@ -1,4 +1,4 @@
-double version = 2.5;
+double version = 2.6;
 /****************************************************************************\
 *       Signal Server: Server optimised SPLAT! by Alex Farrant               *
 ******************************************************************************
@@ -53,11 +53,11 @@ int min_north = 90, max_north = -90, min_west = 360, max_west = -1, ippd, mpi,
 
 unsigned char got_elevation_pattern, got_azimuth_pattern, metric = 0, dbm = 0;
 
-double *elev;
-
+__thread double *elev;
+__thread struct path path;
 struct site tx_site[2];
 struct dem *dem;
-struct path path;
+
 struct LR LR;
 struct region region;
 
@@ -939,14 +939,23 @@ static void free_dem(void)
 	delete [] dem;
 }
 
-static void free_path(void)
+void free_elev(void) {
+  delete [] elev;
+}
+
+void free_path(void)
 {
 	delete [] path.lat;
 	delete [] path.lon;
 	delete [] path.elevation;
 	delete [] path.distance;
 }
 
+void alloc_elev(void)
+{
+  elev  = new double[ARRAYSIZE + 10];
+}
+
 static void alloc_dem(void)
 {
 	int i;
@@ -965,7 +974,7 @@ static void alloc_dem(void)
 	}
 }
 
-static void alloc_path(void)
+void alloc_path(void)
 {
 	path.lat = new double[ARRAYSIZE];
 	path.lon = new double[ARRAYSIZE];
@@ -980,6 +989,8 @@ int main(int argc, char *argv[])
 	    nortRxHin, nortRxHax, propmodel, winfiles, knifeedge = 0, ppa =
 	    0, normalise = 0, haf = 0, pmenv = 1;
 
+	bool use_threads = true;
+
 	unsigned char LRmap = 0, txsites = 0, topomap = 0, geo = 0, kml =
 	    0, area_mode = 0, max_txsites, ngs = 0;
 
@@ -1047,6 +1058,7 @@ int main(int argc, char *argv[])
 			"     -ked Knife edge diffraction (Default for ITM)\n");
 		fprintf(stdout, "     -ng Normalise Path Profile graph\n");
 		fprintf(stdout, "     -haf Halve 1 or 2 (optional)\n");
+		fprintf(stdout, "     -nothreads Turn off threaded processing (optional)\n");
 
 		fflush(stdout);
 
@@ -1057,7 +1069,7 @@ int main(int argc, char *argv[])
 	 * Now we know what mode we are running in, we can allocate various
 	 * data structures.
 	 */
-	elev = new double[ARRAYSIZE + 10];
+	alloc_elev();
 	alloc_dem();
 	alloc_path();
 
@@ -1422,6 +1434,11 @@ int main(int argc, char *argv[])
 			}
 		}
 
+		//Disable threads
+		if (strcmp(argv[x], "-nothreads") == 0) {
+			z = x + 1;
+			use_threads = false;
+		}
 	}
 
 	/* ERROR DETECTION */
@@ -1639,12 +1656,12 @@ int main(int argc, char *argv[])
 
 	if (ppa == 0) {
 		if (propmodel == 2) {
-			PlotLOSMap(tx_site[0], altitudeLR, ano_filename);
+			PlotLOSMap(tx_site[0], altitudeLR, ano_filename, use_threads);
 			DoLOS(mapfile, geo, kml, ngs, tx_site, txsites);
 		} else {
 			// 90% of effort here
 			PlotPropagation(tx_site[0], altitudeLR, ano_filename,
-					propmodel, knifeedge, haf, pmenv);
+					propmodel, knifeedge, haf, pmenv, use_threads);
 
 			// Near field bugfix
 			PutSignal(tx_site[0].lat, tx_site[0].lon, hottest);
@@ -1683,7 +1700,7 @@ int main(int argc, char *argv[])
 	}
 	fflush(stdout);
 
-	delete [] elev;
+	free_elev();
 	free_dem();
 	free_path();
 

main.hh

@@ -23,4 +23,9 @@ double ReadBearing(char *input);
 void ObstructionAnalysis(struct site xmtr, struct site rcvr, double f,
 			 FILE *outfile);
 
+void free_elev(void);
+void free_path(void);
+void alloc_elev(void);
+void alloc_path(void);
+
 #endif /* _MAIN_HH_ */

models/itwom3.0.cc

@@ -451,7 +451,7 @@ double saalos(double d, prop_type & prop, propa_type & propa)
 double adiff(double d, prop_type & prop, propa_type & propa)
 {
 	complex < double >prop_zgnd(prop.zgndreal, prop.zgndimag);
-	static double wd1, xd1, afo, qk, aht, xht;
+	static __thread double wd1, xd1, afo, qk, aht, xht;
 	double a, q, pk, ds, th, wa, ar, wd, adiffv;
 
 	if (d == 0) {
@@ -513,7 +513,7 @@ double adiff(double d, prop_type & prop, propa_type & propa)
 double adiff2(double d, prop_type & prop, propa_type & propa)
 {
 	complex < double >prop_zgnd(prop.zgndreal, prop.zgndimag);
-	static double wd1, xd1, qk, aht, xht, toh, toho, roh, roho, dto, dto1,
+	static __thread double wd1, xd1, qk, aht, xht, toh, toho, roh, roho, dto, dto1,
 	    dtro, dro, dro2, drto, dtr, dhh1, dhh2, /* dhec, */ dtof, dto1f,
 	    drof, dro2f;
 	double a, q, pk, rd, ds, dsl, /* dfdh, */ th, wa, /* ar, wd, sf1, */
@@ -829,7 +829,7 @@ double adiff2(double d, prop_type & prop, propa_type & propa)
 
 double ascat(double d, prop_type & prop, propa_type & propa)
 {
-	static double ad, rr, etq, h0s;
+	static __thread double ad, rr, etq, h0s;
 	double h0, r1, r2, z0, ss, et, ett, th, q;
 	double ascatv, temp;
 
@@ -954,7 +954,7 @@ void qlrps(double fmhz, double zsys, double en0, int ipol, double eps,
 double alos(double d, prop_type & prop, propa_type & propa)
 {
 	complex < double >prop_zgnd(prop.zgndreal, prop.zgndimag);
-	static double wls;
+	static __thread double wls;
 	complex < double >r;
 	double s, sps, q;
 	double alosv;
@@ -1146,8 +1146,8 @@ void qlra(int kst[], int klimx, int mdvarx, prop_type & prop,
 void lrprop(double d, prop_type & prop, propa_type & propa)
 {
 	/* PaulM_lrprop used for ITM */
-	static bool wlos, wscat;
-	static double dmin, xae;
+	static __thread bool wlos, wscat;
+	static __thread double dmin, xae;
 	complex < double >prop_zgnd(prop.zgndreal, prop.zgndimag);
 	double a0, a1, a2, a3, a4, a5, a6;
 	double d0, d1, d2, d3, d4, d5, d6;
@@ -1337,8 +1337,8 @@ void lrprop(double d, prop_type & prop, propa_type & propa)
 void lrprop2(double d, prop_type & prop, propa_type & propa)
 {
 	/* ITWOM_lrprop2 */
-	static bool wlos, wscat;
-	static double dmin, xae;
+	static __thread bool wlos, wscat;
+	static __thread double dmin, xae;
 	complex < double >prop_zgnd(prop.zgndreal, prop.zgndimag);
 	double pd1;
 	double a0, a1, a2, a3, a4, a5, a6, iw;
@@ -1612,8 +1612,8 @@ double curve(double const &c1, double const &c2, double const &x1,
 double avar(double zzt, double zzl, double zzc, prop_type & prop,
 	    propv_type & propv)
 {
-	static int kdv;
-	static double dexa, de, vmd, vs0, sgl, sgtm, sgtp, sgtd, tgtd,
+	static __thread int kdv;
+	static __thread double dexa, de, vmd, vs0, sgl, sgtm, sgtp, sgtd, tgtd,
 	    gm, gp, cv1, cv2, yv1, yv2, yv3, csm1, csm2, ysm1, ysm2,
 	    ysm3, csp1, csp2, ysp1, ysp2, ysp3, csd1, zd, cfm1, cfm2,
 	    cfm3, cfp1, cfp2, cfp3;
@@ -1650,7 +1650,7 @@ double avar(double zzt, double zzl, double zzc, prop_type & prop,
 	double bfp1[7] = { 1.0, 0.93, 1.0, 0.93, 0.93, 1.0, 1.0 };
 	double bfp2[7] = { 0.0, 0.31, 0.0, 0.19, 0.31, 0.0, 0.0 };
 	double bfp3[7] = { 0.0, 2.00, 0.0, 1.79, 2.00, 0.0, 0.0 };
-	static bool ws, w1;
+	static __thread bool ws, w1;
 	double rt = 7.8, rl = 24.0, avarv, q, vs, zt, zl, zc;
 	double sgt, yr, temp1, temp2;
 	int temp_klim = propv.klim - 1;
@@ -1974,6 +1974,7 @@ void z1sq1(double z[], const double &x1, const double &x2, double &z0,
 	xa = xb - xa;
 	x = -0.5 * xa;
 	xb += x;
+	
 	a = 0.5 * (z[ja + 2] + z[jb + 2]);
 	b = 0.5 * (z[ja + 2] - z[jb + 2]) * x;