Remove unused Stripe parameters

Author: JosiahWI

src/iocore/cache/CacheDir.cc

@@ -245,7 +245,7 @@ dir_bucket_loop_fix(Dir *start_dir, int s, Directory *directory)
 }
 
 int
-Directory::freelist_length(Stripe * /* ATS_UNUSED */, int s)
+Directory::freelist_length(int s)
 {
   int  free = 0;
   Dir *seg  = this->get_segment(s);
@@ -281,7 +281,7 @@ Directory::bucket_length(Dir *b, int s)
 }
 
 int
-Directory::check(Stripe * /* ATS_UNUSED */)
+Directory::check()
 {
   int i, s;
   Dbg(dbg_ctl_cache_check_dir, "inside check dir");
@@ -882,7 +882,7 @@ CacheSync::aio_write(int fd, char *b, int n, off_t o)
 }
 
 uint64_t
-Directory::entries_used(Stripe * /* ATS_UNUSED */)
+Directory::entries_used()
 {
   uint64_t full  = 0;
   uint64_t sfull = 0;

src/iocore/cache/CacheProcessor.cc

@@ -457,7 +457,7 @@ CacheProcessor::mark_storage_offline(CacheDisk *d, ///< Target disk
   for (p = 0; p < gnstripes; p++) {
     if (d->fd == gstripes[p]->fd) {
       total_dir_delete   += gstripes[p]->directory.entries();
-      used_dir_delete    += gstripes[p]->directory.entries_used(gstripes[p]);
+      used_dir_delete    += gstripes[p]->directory.entries_used();
       total_bytes_delete += gstripes[p]->len - gstripes[p]->dirlen();
     }
   }
@@ -1518,7 +1518,7 @@ CacheProcessor::cacheInitialized()
         total_direntries              += vol_total_direntries;
         ts::Metrics::Gauge::increment(stripe->cache_vol->vol_rsb.direntries_total, vol_total_direntries);
 
-        uint64_t vol_used_direntries = stripe->directory.entries_used(stripe);
+        uint64_t vol_used_direntries = stripe->directory.entries_used();
         ts::Metrics::Gauge::increment(stripe->cache_vol->vol_rsb.direntries_used, vol_used_direntries);
         used_direntries += vol_used_direntries;
       }

src/iocore/cache/P_CacheDir.h

@@ -293,12 +293,12 @@ struct Directory {
   int      overwrite(const CacheKey *key, StripeSM *stripe, Dir *to_part, Dir *overwrite, bool must_overwrite = true);
   int      remove(const CacheKey *key, StripeSM *stripe, Dir *del);
   void     free_entry(Dir *e, int s);
-  int      check(Stripe *stripe);
+  int      check();
   void     cleanup(Stripe *stripe);
   void     clear_range(off_t start, off_t end, Stripe *stripe);
-  uint64_t entries_used(Stripe *stripe);
+  uint64_t entries_used();
   int      bucket_length(Dir *b, int s);
-  int      freelist_length(Stripe *stripe, int s);
+  int      freelist_length(int s);
   void     clean_segment(int s, Stripe *stripe);
 };
 

src/iocore/cache/Stripe.cc

@@ -260,7 +260,7 @@ Stripe::dir_check()
       ++hist[std::min(h, SEGMENT_HISTOGRAM_WIDTH)];
       seg_chain_max = std::max(seg_chain_max, h);
     }
-    int fl_size       = directory.freelist_length(this, s);
+    int fl_size       = directory.freelist_length(s);
     in_use           += seg_in_use;
     empty            += seg_empty;
     stale            += seg_stale;

src/iocore/cache/unit_tests/test_CacheDir.cc

@@ -108,7 +108,7 @@ class CacheDirTest : public CacheInit
 
     // test insert
     int inserted = 0;
-    int free     = stripe->directory.freelist_length(stripe, s);
+    int free     = stripe->directory.freelist_length(s);
     int n        = free;
     while (n--) {
       if (!stripe->directory.insert(&key, stripe, &dir)) {
@@ -125,7 +125,7 @@ class CacheDirTest : public CacheInit
       }
     }
     stripe->directory.clean_segment(s, stripe);
-    int newfree = stripe->directory.freelist_length(stripe, s);
+    int newfree = stripe->directory.freelist_length(s);
     CHECK(static_cast<unsigned int>(newfree - free) <= 1);
 
     // test insert-delete
@@ -212,15 +212,15 @@ class CacheDirTest : public CacheInit
       Dir *seg1 = vol->directory.get_segment(s1);
       // freelist_length in freelist with loop
       dir_corrupt_bucket(dir_from_offset(vol->header->freelist[s], seg1), s1, vol);
-      vol->directory.freelist_length(vol, s1);
+      vol->directory.freelist_length(s1);
 
       rand_CacheKey(&key);
       s1 = key.slice32(0) % vol->segments;
       b1 = key.slice32(1) % vol->buckets;
       // bucket_length in bucket with loop
       dir_corrupt_bucket(dir_bucket(b1, vol->directory.get_segment(s1)), s1, vol);
       vol->directory.bucket_length(dir_bucket(b1, vol->directory.get_segment(s1)), s1, vol);
-      CHECK(vol->directory.check(vol));
+      CHECK(vol->directory.check());
 #else
       // test corruption detection
       rand_CacheKey(&key);
@@ -233,7 +233,7 @@ class CacheDirTest : public CacheInit
       stripe->directory.insert(&key, stripe, &dir1);
       stripe->directory.insert(&key, stripe, &dir1);
       dir_corrupt_bucket(dir_bucket(b1, stripe->directory.get_segment(s1)), s1, stripe);
-      CHECK(!stripe->directory.check(stripe));
+      CHECK(!stripe->directory.check());
 #endif
     }
     stripe->clear_dir();