Changeset 15347 in project

Timestamp:

08/07/09 10:32:00 (11 years ago)

Author:

Thomas Chust

bzr:base-revision:

chust@web.de-20090806223835-g0snt5f6wtkgrxwg

bzr:committer:

Thomas Chust <chust@web.de>

bzr:file-ids:

Makefile 4989@fca3e652-9b03-0410-8d7b-ac86a6ce46c4:sqlite3%2Ftags%2F1.5.9%2FMakefile
doc.scm 4989@fca3e652-9b03-0410-8d7b-ac86a6ce46c4:sqlite3%2Ftags%2F1.5.9%2Fdoc.scm
sqlite3.html 4989@fca3e652-9b03-0410-8d7b-ac86a6ce46c4:sqlite3%2Ftags%2F1.5.9%2Fsqlite3.html
sqlite3.scm 4989@fca3e652-9b03-0410-8d7b-ac86a6ce46c4:sqlite3%2Ftags%2F1.5.9%2Fsqlite3.scm
sqlite3.setup 4989@fca3e652-9b03-0410-8d7b-ac86a6ce46c4:sqlite3%2Ftags%2F1.5.9%2Fsqlite3.setup
tests/run.scm sqlite3.scm-20090806135642-4ijg0ujxlfdmodmf-2

bzr:mapping-version:

v4

bzr:merge:

chust@web.de-20090807084543-0k93k145degvpz8r

bzr:repository-uuid:

fca3e652-9b03-0410-8d7b-ac86a6ce46c4

bzr:revision-id:

chust@web.de-20090807084745-n1gf84i4nk0xwd62

bzr:revno:

23

bzr:revprop:branch-nick:

release/4/sqlite3/trunk

bzr:root:

release/4/sqlite3/trunk

bzr:text-parents:

Makefile chust@web.de-20090806144351-ew266bq108o4vbqu
doc.scm chust@web.de-20090806223639-6e1xgb7n3glpk9nb
sqlite3.html chust@web.de-20090806223639-6e1xgb7n3glpk9nb
sqlite3.scm chust@web.de-20090806223639-6e1xgb7n3glpk9nb
sqlite3.setup chust@web.de-20090806144351-ew266bq108o4vbqu
tests/run.scm chust@web.de-20090806223639-6e1xgb7n3glpk9nb

bzr:text-revisions:

Makefile chust@web.de-20090807084543-0k93k145degvpz8r
doc.scm chust@web.de-20090807084543-0k93k145degvpz8r
sqlite3.html chust@web.de-20090807084543-0k93k145degvpz8r
sqlite3.scm chust@web.de-20090807083651-p63mut3xxgonfh03
sqlite3.setup chust@web.de-20090807084543-0k93k145degvpz8r
tests/run.scm chust@web.de-20090807083710-02qom8xa48u11tdq

bzr:timestamp:

2009-08-07 10:47:45.490000010 +0200

bzr:user-agent:

bzr1.17+bzr-svn0.6.3

svn:original-date:

2009-08-07T08:47:45.490000Z

Message:

sqlite3: Merged bindings of database memory statistics functions.

Location:

release/4/sqlite3/trunk

Files:

• Makefile (modified) (1 diff)
• doc.scm (modified) (2 diffs)
• sqlite3.html (modified) (2 diffs)
• sqlite3.scm (modified) (2 diffs)
• sqlite3.setup (modified) (1 diff)
• tests/run.scm (modified) (1 diff)

release/4/sqlite3/trunk/Makefile

@@ -12 +12 @@
 
 NAME=sqlite3
-VERSION=3.2.1
+VERSION=3.3.1
 
 .PHONY: all clean

release/4/sqlite3/trunk/doc.scm

@@ -248 +248 @@
             (signature "procedure" ("(map-row PROC STATEMENT . PARAMETERS) " (& "rArr") " LIST"))
             (signature "procedure" ("(map-row PROC DATABASE SQL . PARAMETERS) " (& "rArr") " LIST")))
-          (p "(Compiles the given SQL), resets the statement, binds the statement's free parameters and executes it step by step. After each step, the column values of the current result row are retrieved and " (tt "PROC") " is applied to them. The results of these applications are collected into a list."))
+          (p "(Compiles the given SQL), resets the statement, binds the statement's free parameters and executes it step by step. After each step, the column values of the current result row are retrieved and " (tt "PROC") " is applied to them. The results of these applications are collected into a list.")))
 
       (subsection "Utility functions"
@@ -264 +264 @@
 
         (procedure ("(database-version) " (& "rArr") " STRING")
-          (p "Returns a string identifying the version of SQLite in use.")))))
+          (p "Returns a string identifying the version of SQLite in use."))
+
+        (procedure ("(database-memory-used) " (& "rArr") " CARDINAL-INTEGER")
+          (p "Returns the amount of memory currently in use by the database engine."))
+
+        (procedure ("(database-memory-highwater [RESET?]) " (& "rArr") " CARDINAL-INTEGER")
+          (p "Returns the maximum amount of memory that was in use by the database engine since the counter was last reset or since the program started. Resets the counter if " (tt "RESET?") " is not " (tt "#f") ". " (tt "RESET?") " defaults to " (tt "#f") "."))))
 
     (history
+      (version "3.3.1" "Added bindings for database memory statistics")
       (version "3.3.0" "Switched to using " (tt "(sql-null)") " for " (tt "NULL") " values")
       (version "3.2.1" "Added a test suite")

release/4/sqlite3/trunk/sqlite3.html

@@ -460 +460 @@
 <br /><strong>procedure:</strong> (map-row PROC DATABASE SQL . PARAMETERS) &rArr; LIST</dt>
 <dd>
-<p>(Compiles the given SQL), resets the statement, binds the statement's free parameters and executes it step by step. After each step, the column values of the current result row are retrieved and <tt>PROC</tt> is applied to them. The results of these applications are collected into a list.</p></dd>
+<p>(Compiles the given SQL), resets the statement, binds the statement's free parameters and executes it step by step. After each step, the column values of the current result row are retrieved and <tt>PROC</tt> is applied to them. The results of these applications are collected into a list.</p></dd></div>
 <div class="subsection">
 <h4>Utility functions</h4>
@@ -476 +476 @@
 <dt class="definition"><strong>procedure:</strong> (database-version) &rArr; STRING</dt>
 <dd>
-<p>Returns a string identifying the version of SQLite in use.</p></dd></div></div></div>
+<p>Returns a string identifying the version of SQLite in use.</p></dd>
+<dt class="definition"><strong>procedure:</strong> (database-memory-used) &rArr; CARDINAL-INTEGER</dt>
+<dd>
+<p>Returns the amount of memory currently in use by the database engine.</p></dd>
+<dt class="definition"><strong>procedure:</strong> (database-memory-highwater [RESET?]) &rArr; CARDINAL-INTEGER</dt>
+<dd>
+<p>Returns the maximum amount of memory that was in use by the database engine since the counter was last reset or since the program started. Resets the counter if <tt>RESET?</tt> is not <tt>#f</tt>. <tt>RESET?</tt> defaults to <tt>#f</tt>.</p></dd></div></div>
 <div class="section">
 <h3>Version</h3>
 <ul>
+<li>3.3.1 Added bindings for database memory statistics</li>
 <li>3.3.0 Switched to using <tt>(sql-null)</tt> for <tt>NULL</tt> values</li>
 <li>3.2.1 Added a test suite</li>

release/4/sqlite3/trunk/sqlite3.scm

@@ -72 +72 @@
     sql-complete?
     database-version
+    database-memory-used
+    database-memory-highwater
     enable-shared-cache!
   )
@@ -1039 +1041 @@
   (foreign-lambda c-string "sqlite3_libversion"))
 
+;; Return the amount of memory currently allocated by the database
+(define database-memory-used
+  (foreign-lambda integer "sqlite3_memory_used"))
+
+;; Return the maximum amount of memory allocated by the database since
+;; the counter was last reset
+(define (database-memory-highwater #!optional reset?)
+  ((foreign-lambda integer "sqlite3_memory_highwater" bool) reset?))
+
 ;; Enables (disables) the sharing of the database cache and schema data
 ;; structures between connections to the same database.

release/4/sqlite3/trunk/sqlite3.setup

@@ -8 +8 @@
   'sqlite3
   '("sqlite3.so" "sqlite3.import.so" "sqlite3-static.o")
-  '((version "3.2.1")
+  '((version "3.3.1")
     (static "sqlite3-static.o")
     (documentation "sqlite3.html" "egg.jpg")))

release/4/sqlite3/trunk/tests/run.scm

@@ -289 +289 @@
 
   )
+
+(print "Database memory still used: " (database-memory-used))
+(print "Database memory high water mark: " (database-memory-highwater))