From 68d837b6f9edf4151a8df34f65123b10b35612ea Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 17 Mar 2013 18:15:04 +0100 Subject: [PATCH] Fix confusion over workspace units. --- doc/utilities.texi | 2 +- src/data/settings.c | 2 +- src/language/utilities/set.q | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/utilities.texi b/doc/utilities.texi index 4423080f1b..158177b688 100644 --- a/doc/utilities.texi +++ b/doc/utilities.texi @@ -606,7 +606,7 @@ RANDOM, which will obtain an initial seed from the current time of day. Currently not used. @item WORKSPACE -The maximum amount of memory (in bytes) that @pspp{} will use to store data being processed. +The maximum amount of memory (in kilobytes) that @pspp{} will use to store data being processed. If memory in excess of the workspace size is required, then @pspp{} will start to use temporary files to store the data. Setting a higher value will, in general, mean procedures will run faster, diff --git a/src/data/settings.c b/src/data/settings.c index 47b3f3d5ce..b1d4a80b9d 100644 --- a/src/data/settings.c +++ b/src/data/settings.c @@ -452,7 +452,7 @@ settings_get_workspace_cases (const struct caseproto *proto) bytes. */ void -settings_set_workspace ( size_t workspace) +settings_set_workspace (size_t workspace) { the_settings.workspace = workspace; } diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index 8f59156e2b..14cc4be587 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -875,7 +875,8 @@ show_width (const struct dataset *ds UNUSED) static char * show_workspace (const struct dataset *ds UNUSED) { - return xasprintf ("%d", settings_get_workspace ()); + size_t ws = settings_get_workspace () / 1024L; + return xasprintf ("%ld", ws); } static char * -- 2.30.2