lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [1/6] lucy git commit: Make num_slices a local variable
Date Sat, 07 Nov 2015 17:06:35 GMT
Repository: lucy
Updated Branches:
  refs/heads/master 4ad7e2fe6 -> b2c004b77


Make num_slices a local variable


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/75a1c6ee
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/75a1c6ee
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/75a1c6ee

Branch: refs/heads/master
Commit: 75a1c6ee751b2fcb7e031ca08cfecdb9bfdbabfa
Parents: 25759e0
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Thu Nov 5 17:14:43 2015 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Thu Nov 5 17:14:43 2015 +0100

----------------------------------------------------------------------
 core/Lucy/Util/SortExternal.c   | 18 ++++++++----------
 core/Lucy/Util/SortExternal.cfh |  1 -
 2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/75a1c6ee/core/Lucy/Util/SortExternal.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/SortExternal.c b/core/Lucy/Util/SortExternal.c
index 4d75839..55ac9a2 100644
--- a/core/Lucy/Util/SortExternal.c
+++ b/core/Lucy/Util/SortExternal.c
@@ -55,7 +55,6 @@ SortEx_init(SortExternal *self) {
     ivars->runs         = Vec_new(0);
     ivars->slice_sizes  = NULL;
     ivars->slice_starts = NULL;
-    ivars->num_slices   = 0;
     ivars->flipped      = false;
 
     ABSTRACT_CLASS_CHECK(self, SORTEXTERNAL);
@@ -267,6 +266,7 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
     if (ivars->buf_max != 0) { THROW(ERR, "Can't refill unless empty"); }
 
     // Move all the elements in range into the main buffer as slices.
+    uint32_t num_slices = 0;
     for (uint32_t i = 0; i < num_runs; i++) {
         SortExternal *const run = (SortExternal*)Vec_Fetch(ivars->runs, i);
         SortExternalIVARS *const run_ivars = SortEx_IVARS(run);
@@ -286,13 +286,13 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
             ivars->buf_max += slice_size;
 
             // Track number of slices and slice sizes.
-            slice_sizes[ivars->num_slices++] = slice_size;
+            slice_sizes[num_slices++] = slice_size;
         }
     }
 
     // Transform slice starts from ticks to pointers.
     uint32_t total = 0;
-    for (uint32_t i = 0; i < ivars->num_slices; i++) {
+    for (uint32_t i = 0; i < num_slices; i++) {
         slice_starts[i] = ivars->buffer + total;
         total += slice_sizes[i];
     }
@@ -307,12 +307,12 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
 
     // Exploit previous sorting, rather than sort buffer naively.
     // Leave the first slice intact if the number of slices is odd. */
-    while (ivars->num_slices > 1) {
+    while (num_slices > 1) {
         uint32_t i = 0;
         uint32_t j = 0;
 
-        while (i < ivars->num_slices) {
-            if (ivars->num_slices - i >= 2) {
+        while (i < num_slices) {
+            if (num_slices - i >= 2) {
                 // Merge two consecutive slices.
                 const uint32_t merged_size = slice_sizes[i] + slice_sizes[i + 1];
                 Sort_merge(slice_starts[i], slice_sizes[i],
@@ -324,7 +324,7 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
                 i += 2;
                 j += 1;
             }
-            else if (ivars->num_slices - i >= 1) {
+            else if (num_slices - i >= 1) {
                 // Move single slice pointer.
                 slice_sizes[j]  = slice_sizes[i];
                 slice_starts[j] = slice_starts[i];
@@ -332,10 +332,8 @@ S_absorb_slices(SortExternal *self, SortExternalIVARS *ivars,
                 j += 1;
             }
         }
-        ivars->num_slices = j;
+        num_slices = j;
     }
-
-    ivars->num_slices = 0;
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy/blob/75a1c6ee/core/Lucy/Util/SortExternal.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/SortExternal.cfh b/core/Lucy/Util/SortExternal.cfh
index 8ac0ad0..cdc2dbb 100644
--- a/core/Lucy/Util/SortExternal.cfh
+++ b/core/Lucy/Util/SortExternal.cfh
@@ -45,7 +45,6 @@ abstract class Lucy::Util::SortExternal nickname SortEx
     Obj          **scratch;
     uint32_t       scratch_cap;
     Vector        *runs;
-    uint32_t       num_slices;
     Obj         ***slice_starts;
     uint32_t      *slice_sizes;
     uint32_t       mem_thresh;


Mime
View raw message