Changeset d694de in git for Singular/LIB

Timestamp:

Jun 18, 1999, 3:47:27 PM (25 years ago)

Author:

Gert-Martin Greuel <greuel@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

092430050dbf6ad127e0cf157b408a5b79bf6403

Parents:

96badc17f8c673319c806aa0ade02ab8ab717e4a

Message:

* extension of proc kmemory


git-svn-id: file:///usr/local/Singular/svn/trunk@3146 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/general.lib (modified) (3 diffs)

Singular/LIB/general.lib

@@ -1 @@
-// $Id: general.lib,v 1.11 1999-06-07 17:25:07 Singular Exp $
+// $Id: general.lib,v 1.12 1999-06-18 13:47:27 greuel Exp $
 //system("random",787422842);
-//GMG, last modified 30.9.98
-///////////////////////////////////////////////////////////////////////////////
-
-version="$Id: general.lib,v 1.11 1999-06-07 17:25:07 Singular Exp $";
+//GMG, last modified 18.6.99
+///////////////////////////////////////////////////////////////////////////////
+
+version="$Id: general.lib,v 1.12 1999-06-18 13:47:27 greuel Exp $";
 info="
 LIBRARY:  general.lib   PROCEDURES OF GENERAL TYPE
@@ -13 +13 @@
  factorial(n[,../..]);  n factorial (=n!) (type int), [type string/number]
  fibonacci(n[,p]);      nth Fibonacci number [char p]
- kmemory();             int = active memory (kilobyte)
+ kmemory([n]);          active [allocated] memory in kilobyte
  killall();             kill all user-defined variables
  number_e(n);           compute exp(1) up to n decimal digits
@@ -230 +230 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-proc kmemory ()
-"USAGE:   kmemory();
-RETURN:  memory used by active variables, of type int (in kilobyte)
+proc kmemory (list #)
+"USAGE:   kmemory([n]); n = int
+RETURN:  memory in kilobyte of type int
+         n=0: memory used by active variables (same as no parameters)
+         n=1: total memory allocated by Singular
+         n=2: difference between top and init memory adress (sbrk memory)
+         n!=0,1,2: 0
+DISPLAY: detailed information about allocated and used memory if n!=0,1,2
+NOTE:    kmemory uses internal function 'memory' to compute kilobyte, and
+         is the same as 'memory' for n!=0,1,2
 EXAMPLE: example kmemory; shows an example
 "
-{
-  if ( voice==2 ) { "// memory used by active variables (kilobyte):"; }
-   return ((memory(0)+1023)/1024);
+{ 
+   int n;
+   if (size(#) != 0)
+   {
+     n=#[1];
+   }
+   
+  if ( n==0)
+  { dbprint(printlevel-voice+3,
+    "// memory used, at the moment, by active variables (kilobyte):"); }
+  if ( n==1 )
+  { dbprint(printlevel-voice+3,
+    "// total memory allocated, at the moment, by SINGULAR (kilobyte):"); }
+   return ((memory(n)+1023)/1024);
 }
 example
 { "EXAMPLE:"; echo = 2;
    kmemory();
+   kmemory(1);
 }
 ///////////////////////////////////////////////////////////////////////////////