[oprof-cvs] CVS: oprofile/gui oprof_start.cpp,1.41,1.42 oprof_start_config.cpp,1.16,1.17 oprof_start_config.h,1.10,1.11

[Philippe E. <ph...@us...>]

Update of /cvsroot/oprofile/oprofile/gui
In directory usw-pr-cvs1:/tmp/cvs-serv18171/oprofile/gui

Modified Files:
	oprof_start.cpp oprof_start_config.cpp oprof_start_config.h 
Log Message:
various module buffer size fix

Index: oprof_start.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- oprof_start.cpp	20 Mar 2002 21:19:43 -0000	1.41
+++ oprof_start.cpp	22 Mar 2002 21:18:43 -0000	1.42
@@ -200,9 +200,9 @@
  
 	event_count_edit->setValidator(event_count_validator); 
 	QIntValidator * iv;
-	iv = new QIntValidator(OP_MIN_BUFFER_SIZE, OP_MAX_BUFFER_SIZE, buffer_size_edit);
+	iv = new QIntValidator(OP_MIN_BUF_SIZE, OP_MAX_BUF_SIZE, buffer_size_edit);
 	buffer_size_edit->setValidator(iv); 
-	iv = new QIntValidator(OP_MIN_HASH_TABLE_SIZE, OP_MAX_HASH_TABLE_SIZE, hash_table_size_edit);
+	iv = new QIntValidator(OP_MIN_HASH_SIZE, OP_MAX_HASH_SIZE, hash_table_size_edit);
 	hash_table_size_edit->setValidator(iv); 
 	iv = new QIntValidator(OP_MIN_NOTE_TABLE_SIZE, OP_MAX_NOTE_TABLE_SIZE, note_table_size_edit);
 	note_table_size_edit->setValidator(iv); 
@@ -585,12 +585,12 @@
 	config.map_filename = map_filename_edit->text().latin1();
 
 	uint temp = buffer_size_edit->text().toUInt();
-	if (temp < OP_MIN_BUFFER_SIZE || temp > OP_MAX_BUFFER_SIZE) {
+	if (temp < OP_MIN_BUF_SIZE || temp > OP_MAX_BUF_SIZE) {
 		std::ostringstream error;
 
 		error << "buffer size out of range: " << temp
-		      << " valid range is [" << OP_MIN_BUFFER_SIZE << ", "
-		      << OP_MAX_BUFFER_SIZE << "]";
+		      << " valid range is [" << OP_MIN_BUF_SIZE << ", "
+		      << OP_MAX_BUF_SIZE << "]";
 
 		QMessageBox::warning(this, 0, error.str().c_str());
 
@@ -599,12 +599,12 @@
 	config.buffer_size = temp;
 
 	temp = hash_table_size_edit->text().toUInt();
-	if (temp < OP_MIN_HASH_TABLE_SIZE || temp > OP_MAX_HASH_TABLE_SIZE) {
+	if (temp < OP_MIN_HASH_SIZE || temp > OP_MAX_HASH_SIZE) {
 		std::ostringstream error;
 
 		error << "hash table size out of range: " << temp
-		      << " valid range is [" << OP_MIN_HASH_TABLE_SIZE << ", "
-		      << OP_MAX_HASH_TABLE_SIZE << "]";
+		      << " valid range is [" << OP_MIN_HASH_SIZE << ", "
+		      << OP_MAX_HASH_SIZE << "]";
 
 		QMessageBox::warning(this, 0, error.str().c_str());
 

Index: oprof_start_config.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_config.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- oprof_start_config.cpp	14 Jan 2002 05:53:35 -0000	1.16
+++ oprof_start_config.cpp	22 Mar 2002 21:18:43 -0000	1.17
@@ -80,7 +80,7 @@
 
 config_setting::config_setting()
 	:
-	buffer_size(OP_DEFAULT_BUFFER_SIZE),
+	buffer_size(OP_DEFAULT_BUF_SIZE),
 	hash_table_size(OP_DEFAULT_HASH_SIZE),
 	note_table_size(OP_DEFAULT_NOTE_SIZE),
 	// FIXME: member of config, hardcoded value probably come from ? 

Index: oprof_start_config.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start_config.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- oprof_start_config.h	17 Jan 2002 08:42:56 -0000	1.10
+++ oprof_start_config.h	22 Mar 2002 21:18:43 -0000	1.11
@@ -23,23 +23,6 @@
 #include "persistent_config.h"
 #include "../op_user.h"
 
-// FIXME: must be shared.
-#define OP_MAX_PERF_COUNT	2147483647UL
-#define OP_MAX_RTC_COUNT	4096
-
-#define OP_DEFAULT_BUFFER_SIZE	262144
-#define OP_MAX_BUFFER_SIZE	1048576
-#define OP_MIN_BUFFER_SIZE	1024
-
-#define OP_DEFAULT_HASH_SIZE	65536
-#define OP_MAX_HASH_TABLE_SIZE	262144
-#define OP_MIN_HASH_TABLE_SIZE	256
-
-#define OP_DEFAULT_NOTE_SIZE	16384
-#define OP_PRE_NOTE_WATERMARK	64
-#define OP_MIN_NOTE_TABLE_SIZE	(1024 + OP_PRE_NOTE_WATERMARK)
-#define OP_MAX_NOTE_TABLE_SIZE	1048576
-
 // This is a standard non-portable assumption we make. 
 #define OP_MIN_PID		0
 #define OP_MAX_PID		32767