branch: externals/vlf
commit ca564988e054b93b4c830b856c208466858ad98d
Author: Andrey Kotlarski <[email protected]>
Commit: Andrey Kotlarski <[email protected]>
Change vlf-tune-get-optimal to optimize on total time of primitive
operations, also fix hexl timing functions not to book in cases where
hexl is already (not) active.
---
vlf-search.el | 4 ++++
vlf-tune.el | 52 +++++++++++++++++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/vlf-search.el b/vlf-search.el
index 45fe1c9..6ef7b7d 100644
--- a/vlf-search.el
+++ b/vlf-search.el
@@ -158,6 +158,10 @@ Return nil if nothing found."
(if success
(vlf-update-buffer-name)
(vlf-move-to-chunk match-chunk-start match-chunk-end))
+ (setq vlf-batch-size (vlf-tune-get-optimal
+ (if (derived-mode-p 'hexl-mode)
+ '(:hexl :dehexlify :insert :encode)
+ '(:insert :encode))))
(let* ((match-end (or (byte-to-position (- match-pos-end
vlf-start-pos))
(point-max)))
diff --git a/vlf-tune.el b/vlf-tune.el
index e3642bb..f406ad4 100644
--- a/vlf-tune.el
+++ b/vlf-tune.el
@@ -160,15 +160,17 @@ SIZE is number of bytes that are saved."
(defun vlf-tune-hexlify ()
"Activate `hexl-mode' and save time it takes."
- (let ((time (car (vlf-time (hexl-mode)))))
- (vlf-tune-add-measurement vlf-tune-hexl-bps
- hexl-max-address time)))
+ (or (derived-mode-p 'hexl-mode)
+ (let ((time (car (vlf-time (hexl-mode)))))
+ (vlf-tune-add-measurement vlf-tune-hexl-bps
+ hexl-max-address time))))
(defun vlf-tune-dehexlify ()
"Exit `hexl-mode' and save time it takes."
- (let ((time (car (vlf-time (hexl-mode-exit)))))
- (vlf-tune-add-measurement vlf-tune-dehexlify-bps
- hexl-max-address time)))
+ (if (derived-mode-p 'hexl-mode)
+ (let ((time (car (vlf-time (hexl-mode-exit)))))
+ (vlf-tune-add-measurement vlf-tune-dehexlify-bps
+ hexl-max-address time))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; tuning
@@ -238,20 +240,26 @@ If APPROXIMATE is t, do approximation for missing values."
index t))
0)))
-(defun vlf-tune-score (types index &optional approximate)
+(defun vlf-tune-score (types index &optional approximate time-max)
"Calculate cumulative speed over TYPES for INDEX.
-If APPROXIMATE is t, do approximation for missing values."
+If APPROXIMATE is t, do approximation for missing values.
+If TIME-MAX is non nil, return cumulative time instead of speed.
+If it is number, stop as soon as cumulative time gets equal or above."
(catch 'result
(let ((time 0)
- (size (* (1+ index) vlf-tune-step)))
- (dolist (el types (/ size time))
+ (size (* (1+ index) vlf-tune-step))
+ (cut-time (numberp time-max)))
+ (dolist (el types (if time-max time
+ (/ size time)))
(let ((bps (if (consp el)
(vlf-tune-assess (car el) (cadr el) index
approximate)
(vlf-tune-assess el 1 index approximate))))
(if (zerop bps)
(throw 'result nil)
- (setq time (+ time (/ size bps)))))))))
+ (setq time (+ time (/ size bps)))
+ (and cut-time (<= time-max time)
+ (throw 'result nil))))))))
(defun vlf-tune-conservative (types &optional index)
"Adjust `vlf-batch-size' to best nearby value over TYPES.
@@ -348,17 +356,23 @@ Suitable for multiple batch operations."
(vlf-tune-binary types 0 max-idx)))))))
(defun vlf-tune-get-optimal (types)
- "Get best batch size according to existing measurements over TYPES."
+ "Get best batch size according to existing measurements over TYPES.
+Best is considered where primitive operations total closest to second."
(let ((max-idx (1- (/ (min vlf-tune-max (/ (1+ vlf-file-size) 2))
vlf-tune-step)))
+ (idx 0)
(best-idx 0)
- (best-bps 0)
- (idx 0))
- (while (< idx max-idx)
- (let ((bps (vlf-tune-score types idx t)))
- (and bps (< best-bps bps)
- (setq best-idx idx
- best-bps bps)))
+ (best-time-diff 1))
+ (while (and (not (zerop best-time-diff)) (< idx max-idx))
+ (let ((time-diff (vlf-tune-score types idx t
+ (1+ best-time-diff))))
+ (when time-diff
+ (setq time-diff (if (< 1 time-diff)
+ (- time-diff 1)
+ (- 1 time-diff)))
+ (if (< time-diff best-time-diff)
+ (setq best-idx idx
+ best-time-diff time-diff))))
(setq idx (1+ idx)))
(* (1+ best-idx) vlf-tune-step)))
