--- parser3/src/classes/math.C	2001/07/18 10:06:04	1.4
+++ parser3/src/classes/math.C	2002/03/27 15:30:34	1.16
@@ -1,18 +1,21 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: math.C,v 1.16 2002/03/27 15:30:34 paf Exp $
 */
-static const char *RCSId="$Id: math.C,v 1.4 2001/07/18 10:06:04 parser Exp $"; 
 
-#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_vint.h"
 #include "pa_vmath.h"
 #include "pa_request.h"
 
+#ifdef WIN32
+#	include <windows.h>
+#endif
+
 // defines
 
 #define PI 3.1415926535
@@ -23,32 +26,32 @@ static const char *RCSId="$Id: math.C,v
 class MMath : public Methoded {
 public:
 	MMath(Pool& pool);
+	void configure_admin(Request& r);
+
 public: // Methoded
-	bool used_directly() { return true; }
+	bool used_directly() { return false; }
 };
 
 // methods
-
+static unsigned int randomizer=0;
 static void _random(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
 	Value& range=params->as_junction(0, "range must be expression");
-    uint max=(uint)r.process(range).as_double();
-    if(max<=1)
-		PTHROW(0, 0,
+    double top=r.process(range).as_double();
+    if(top<=1)
+		throw Exception("parser.runtime",
 			&method_name,
-			"bad range [0..%u]", max);
+			"top must be above 1 (%g)", top);
 	
-	Value& result=*new(pool) VInt(pool, rand()%max);
+	Value& result=*new(pool) VInt(pool, (int)(
+		((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * uint(top) ));
 	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
 
 typedef double (*math1_func_ptr)(double);
-static double round(double param) { return floor(param+0.5); }
-static double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); }
-static double trunc(double param) { return param > 0? floor(param) : ceil(param); }
 static double frac(double param) { return param-trunc(param); }
 static double degrees(double param) { return param /PI *180; }
 static double radians(double param) { return param /180 *PI; }
@@ -108,10 +111,6 @@ MATH2(pow);
 
 MMath::MMath(Pool& apool) : Methoded(apool) {
 	set_name(*NEW String(pool(), MATH_CLASS_NAME));
-
-
-	// setting seed
-	srand(getpid()+time(NULL));  rand();
 	
 	// ^FUNC(expr)	
 #define ADD1(name) \
@@ -136,6 +135,24 @@ MMath::MMath(Pool& apool) : Methoded(apo
 
 }
 
+// in MSVC each thread has it's own pseudo-random sequence
+// in win32 apache each thread can handle multiple requests
+// so to get proper randoms we remember random generated in one thread
+void MMath::configure_admin(Request&) {
+	// setting seed
+	srand(
+		randomizer
+#ifdef WIN32
+		^ GetCurrentThreadId()
+#else
+		^ getpid()
+#endif
+		^ (unsigned int)time(NULL)
+	);
+	if(!randomizer)
+		randomizer=rand();
+}
+
 // global variables
 
 Methoded *math_base_class;