Update of /cvsroot/monetdb/MonetDB4/tests/Availability/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11254/tests/Availability/Tests

Modified Files:
      Tag: MonetDB_4-22
        00_Mserver.stable.out 01_Modules_static.stable.out 
Log Message:
Changed the way we check for and use mallinfo(): If mallinfo() returns
a struct with fields which are too small to hold the information it is
supposed to return (e.g. 32 bits on a 64-bit system), we ignore
mallinfo().  Also, we use our own struct to hold the information, so
that the rest of the software can rely on bot the presence of the
struct and the types of the fields.  

This also results in one interface change: the view_gdk_memory() and
memory() functions in M4 and the memStatistics() function in M5 now
return a BAT with a wrd tail instead of int.


Index: 01_Modules_static.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/MonetDB4/tests/Availability/Tests/01_Modules_static.stable.out,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- 01_Modules_static.stable.out        4 Jan 2008 18:03:08 -0000       1.10
+++ 01_Modules_static.stable.out        12 Feb 2008 09:23:38 -0000      1.10.2.1
@@ -1111,7 +1111,7 @@
 [ "mem_maxsize",         "COMMAND:   ",  "mem_maxsize(lng) : void",            
                                                  "set the maximum usable 
amount of physical swapspace in KB"                                             
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
]
 [ "mem_printmap",        "COMMAND:   ",  "mem_printmap() : void",              
                                                  "print a map of all memory 
that is in use"                                                                 
                                                                                
                                                                                
                                                                                
                                                                                
                                                                             ]
 [ "mem_usage",           "COMMAND:   ",  "mem_usage(lng) : BAT[str,lng]",      
                                                  "get a split-up of how much 
memory blocks are in use."                                                      
                                                                                
                                                                                
                                                                                
                                                                                
                                                                            ]
-[ "memory",              "PROC:      ",  "memory() : BAT[str,int]",            
                                                  "Global memory usage info"    
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                          ]
+[ "memory",              "PROC:      ",  "memory() : BAT[str,wrd]",            
                                          "Global memory usage info"            
                                                                                
                                                                                
                                                                                
                                          ]
 [ "module_db",           "COMMAND:   ",  "module_db(str) : str",               
                                                  "extract database name from 
module string"                                                                  
                                                                                
                                                                                
                                                                                
                                                                                
                                                                            ]
 [ "module_name",         "COMMAND:   ",  "module_name(str) : str",             
                                                  "extract module name from 
module string"                                                                  
                                                                                
                                                                                
                                                                                
                                                                                
                                                                              ]
 [ "modules",             "PROC:      ",  "modules() : void",                   
                                                  "list all installed modules, 
plus owner and db restrictions"                                                 
                                                                                
                                                                                
                                                                                
                                                                                
                                                                           ]
@@ -1145,7 +1145,7 @@
 [ "view_gdk_env",        "COMMAND:   ",  "view_gdk_env() : BAT[str,str]",      
                                                  "List the values of all 
environment variables"                                                          
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
]
 [ "view_gdk_io",         "COMMAND:   ",  "view_gdk_io() : BAT[str,int]",       
                                                  "Global IO activityinfo"      
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                          ]
 [ "view_gdk_mem_histo",          "COMMAND:   ",  "view_gdk_mem_histo() : 
BAT[lng,lng]",                                                  "Global memory 
histogram"                                                                      
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
         ]
-[ "view_gdk_memory",     "COMMAND:   ",  "view_gdk_memory() : BAT[str,int]",   
                                                  "Global memory usage info"    
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
                                                                          ]
+[ "view_gdk_memory",     "COMMAND:   ",  "view_gdk_memory() : BAT[str,wrd]",   
                                          "Global memory usage info"            
                                                                                
                                                                                
                                                                                
                                          ]
 [ "view_gdk_thread",     "COMMAND:   ",  "view_gdk_thread() : BAT[int,str]",   
                                                  "Pseudo bat to map thread to 
name"                                                                           
                                                                                
                                                                                
                                                                                
                                                                                
                                                                           ]
 [ "view_gdk_vm_histo",   "COMMAND:   ",  "view_gdk_vm_histo() : BAT[lng,lng]", 
                                                  "Global virtual memory 
histogram"                                                                      
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
 ]
 [ "view_modules",        "COMMAND:   ",  "view_modules() : BAT[int,str]",      
                                                  "Pseudo bat with all 
currently available modules"                                                    
                                                                                
                                                                                
                                                                                
                                                                                
                                                                                
   ]

Index: 00_Mserver.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/MonetDB4/tests/Availability/Tests/00_Mserver.stable.out,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- 00_Mserver.stable.out       27 Jan 2008 17:16:29 -0000      1.21
+++ 00_Mserver.stable.out       12 Feb 2008 09:23:38 -0000      1.21.2.1
@@ -1,14 +1,16 @@
 stdout of test '00_Mserver` in directory 'tests/Availability` itself:
 
 
-# 10:05:29 >  
-# 10:05:29 >   Mserver 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10 
--set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs" 
--set 
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
 --set mapi_open=true --set xrpc_open=true --set mapi_port=38294 --set 
xrpc_port=49233 --set monet_prompt= --trace --dbname=mTests_tests_Availability 
00_Mserver.prelude 
-# 10:05:29 >  
+# 09:52:00 >  
+# 09:52:00 >   Mserver 
"--config=/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/conf/MonetDB.conf"
 --debug=10 --set 
"monet_mod_path=/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/plain/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/plain:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/contrib/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/contrib:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/calibrator/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/modules/calibrator:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/mapi/.libs:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/src/mapi:/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/scripts/tools"
 --set "gdk_dbfarm=/ufs/sjoerd/
 src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/dbfarm" --set 
"sql_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/sql_logs"
 --set 
"xquery_logdir=/ufs/sjoerd/src/MonetDB/virgin-stable/MonetDB4/x86_64-unknown-linux-gnu/xquery_logs"
 --set mapi_open=true --set xrpc_open=true --set mapi_port=39367 --set 
xrpc_port=46798 --set monet_prompt= --trace  --dbname=mTests_tests_Availability 
00_Mserver.prelude 
+# 09:52:00 >  
 
-# MonetDB Server v4.21.0
-# based on GDK   v1.21.0
-# Copyright (c) 1993-2007, CWI. All rights reserved.
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs; dynamically 
linked.
+
+
+# MonetDB Server v4.22.0
+# based on GDK   v1.22.0
+# Copyright (c) 1993-2008, CWI. All rights reserved.
+# Compiled for x86_64-unknown-linux-gnu/64bit with 32bit OIDs; dynamically 
linked.
 # Visit http://monetdb.cwi.nl/ for further information.
 #---------------------------------#
 # BAT:           tmp_30          #


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to