From 2c3ddf6f0dc197c7bd34a820fbe982e8d6b6be74 Mon Sep 17 00:00:00 2001
From: Didactic Drunk <1479616+didactic-drunk@users.noreply.github.com>
Date: Thu, 27 Jun 2019 09:34:23 -0700
Subject: [PATCH] Enhance pwhash_selector example and add table output [skip
 ci]

---
 README.md                   | 17 +++++++++++
 examples/pwhash_selector.cr | 59 ++++++++++++++++++++++++++++++-------
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ea6ad61..3fb25e0 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,23 @@ pwhash.verify hash, pass
 Use `examples/pwhash_selector.cr` to help choose ops/mem limits.
 
 
+Example output:
+Ops limit →
+
+|          |       1 |       4 |      16 |      64 |     256 |    1024 |    4096 |   16384 |   65536 |  262144 | 1048576 |
+| -------- | ------- | ------- | ------- | ------- | ------- | ------- | ------- | ------- | ------- | ------- | ------- |
+|       8K |         |         |         |         |         |         |         |         |         |  0.542s |  2.114s |
+|      32K |         |         |         |         |         |         |         |         |  0.513s |  2.069s |
+|     128K |         |         |         |         |         |         |         |  0.530s |  2.121s |
+|     512K |         |         |         |         |         |         |  0.566s |  2.237s |
+|    2048K |         |         |         |         |         |  0.567s |  2.290s |
+|    8192K |         |         |         |         |  0.670s |  2.542s |
+|   32768K |         |         |         |  0.684s |  2.777s |
+|  131072K |         |         |  0.805s |  3.106s |
+|  524288K |  0.504s |  1.135s |  3.661s |
+| 2097152K |  2.119s |
+|   Memory |
+
 ## Contributing
 
 1. Fork it ( https://github.com/didactic-drunk/cox/fork )
diff --git a/examples/pwhash_selector.cr b/examples/pwhash_selector.cr
index aad764d..0852eb0 100644
--- a/examples/pwhash_selector.cr
+++ b/examples/pwhash_selector.cr
@@ -1,4 +1,5 @@
 require "../src/cox"
+require "tallboy"
 
 if ARGV.empty?
   puts "Help select Pwhash ops/mem limits for your application."
@@ -18,31 +19,67 @@ mem_limit = (ARGV.shift?.try &.to_i || (Cox::Pwhash::MEMLIMIT_MAX)).to_u64
 pwhash = Cox::Pwhash.new
 pass = "1234"
 
+#data = Array(Array({UInt64, UInt64, Float64})).new
+header = ["      "]
+data = [header]
+
+def bytes_str(b)
+  suffix = if b >= 1024*1024
+    b /= (1024*1024)
+    "M"
+  elsif b >= 1024
+    b = b / 1024
+    "K"
+  else
+    ""
+  end
+  "%5d#{suffix}" % b
+end
+
 pwhash.memlimit = Cox::Pwhash::MEMLIMIT_MIN
 loop do
   pwhash.opslimit = Cox::Pwhash::OPSLIMIT_MIN
+  row = ["%5dK" % (pwhash.memlimit / 1024)]
+  data << row
 
   loop do
     # p pwhash
     t = Time.measure { pwhash.store pass }.to_f
-    s = String.build do |sb|
-      sb << "mem_limit "
-      sb << "%7d" % (pwhash.memlimit / 1024)
-      sb << "K       ops_limit "
-      sb << "%7d" % pwhash.opslimit
-      sb << "       "
-      sb << "%8.4fs" % t
+    ostr = "%7d" % pwhash.opslimit
+    header << ostr if data.size == 2
+    if t >= time_min
+      mstr = bytes_str pwhash.memlimit
+#      mstr = "%5dK" % (pwhash.memlimit / 1024)
+      tstr = "%6.3fs" % t
+      row << tstr
+      s = String.build do |sb|
+        sb << "mem_limit "
+        sb << mstr
+        sb << "    ops_limit "
+        sb << ostr
+        sb << "    "
+        sb << tstr
+      end
+      puts s
+    else
+      row << "       "
     end
-    puts s if t >= time_min
 
     break if t >= time_limit
-    pwhash.opslimit *= 2
+    pwhash.opslimit *= 4
   end
+  row << "" # puts | on the end
   puts ""
 
   break if pwhash.memlimit >= mem_limit
   break if pwhash.opslimit == Cox::Pwhash::OPSLIMIT_MIN # Couldn't get past 1 iteration before going over time.
-  pwhash.memlimit *= 2
+  pwhash.memlimit *= 4
 end
+#header << "Ops limit"
+data << ["Memory"]
 
-# TODO: table format
+# Quick n dirty sparse table.
+puts "Ops Limit --->"
+data.each do |row|
+  puts row.join(" | ")
+end