sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2024-10-05 18:30:51 +01:00
Code Issues Releases Wiki Activity

Change linear tune to search only known measures and use it to

Browse Source 
initialize occur indexing.  Make default tune step smaller.
This commit is contained in:
Andrey Kotlarski 2014-10-02 13:49:42 +03:00
parent 3cfa9b1935
commit 61599a007f
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlf-occur.el
View File

@ -149,6 +149,7 @@ EVENT may hold details of the invocation."
Prematurely ending indexing will still show what's found so far." Prematurely ending indexing will still show what's found so far."
(let ((vlf-buffer (current-buffer)) (let ((vlf-buffer (current-buffer))
(file buffer-file-name) (file buffer-file-name)
(file-size vlf-file-size)
(batch-size vlf-batch-size) (batch-size vlf-batch-size)
(is-hexl (derived-mode-p 'hexl-mode)) (is-hexl (derived-mode-p 'hexl-mode))
(insert-bps vlf-tune-insert-bps) (insert-bps vlf-tune-insert-bps)
@ -158,7 +159,8 @@ Prematurely ending indexing will still show what's found so far."
(with-temp-buffer (with-temp-buffer
(setq buffer-file-name file (setq buffer-file-name file
buffer-file-truename file buffer-file-truename file
buffer-undo-list t) buffer-undo-list t
vlf-file-size file-size)
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(set (make-local-variable 'vlf-batch-size) batch-size) (set (make-local-variable 'vlf-batch-size) batch-size)
(when vlf-tune-enabled (when vlf-tune-enabled
@ -167,8 +169,8 @@ Prematurely ending indexing will still show what's found so far."
(if is-hexl (if is-hexl
(progn (setq vlf-tune-hexl-bps hexl-bps (progn (setq vlf-tune-hexl-bps hexl-bps
vlf-tune-insert-raw-bps insert-raw-bps) vlf-tune-insert-raw-bps insert-raw-bps)
(vlf-tune-batch '(:hexl :raw))) (vlf-tune-batch '(:hexl :raw) t))
(vlf-tune-batch '(:insert :encode)))) (vlf-tune-batch '(:insert :encode) t)))
(vlf-mode 1) (vlf-mode 1)
(if is-hexl (hexl-mode)) (if is-hexl (hexl-mode))
(goto-char (point-min)) (goto-char (point-min))
@ -203,7 +205,7 @@ Prematurely ending indexing will still show what's found so far."
(is-hexl (derived-mode-p 'hexl-mode))) (is-hexl (derived-mode-p 'hexl-mode)))
(vlf-tune-batch (if (derived-mode-p 'hexl-mode) (vlf-tune-batch (if (derived-mode-p 'hexl-mode)
'(:hexl :raw) '(:hexl :raw)
'(:insert :encode))) '(:insert :encode)) t)
(vlf-with-undo-disabled (vlf-with-undo-disabled
(vlf-move-to-batch 0) (vlf-move-to-batch 0)
(goto-char (point-min)) (goto-char (point-min))

22
vlf-tune.el
View File

@ -63,7 +63,7 @@ but don't change batch size. If t, measure and change."
"Maximum batch size in bytes when auto tuning." "Maximum batch size in bytes when auto tuning."
:group 'vlf :type 'integer) :group 'vlf :type 'integer)
(defcustom vlf-tune-step (/ vlf-tune-max 1000) (defcustom vlf-tune-step (/ vlf-tune-max 10000)
"Step used for tuning in bytes." "Step used for tuning in bytes."
:group 'vlf :type 'integer) :group 'vlf :type 'integer)
@ -339,22 +339,18 @@ MIN and MAX specify interval of indexes to search."
(setq vlf-batch-size (* (1+ left-idx) vlf-tune-step))))))) (setq vlf-batch-size (* (1+ left-idx) vlf-tune-step)))))))
(defun vlf-tune-linear (types max-idx) (defun vlf-tune-linear (types max-idx)
"Adjust `vlf-batch-size' to optimal value using linear search,\ "Adjust `vlf-batch-size' to optimal known value using linear search.
optimizing over TYPES up to MAX-IDX." Optimize over TYPES up to MAX-IDX."
(let ((best-idx 0) (let ((best-idx 0)
(best-bps 0) (best-bps 0)
(idx 0) (idx 0))
(none-missing t)) (while (< idx max-idx)
(while (and none-missing (< idx max-idx))
(let ((bps (vlf-tune-score types idx))) (let ((bps (vlf-tune-score types idx)))
(cond ((null bps) (and bps (< best-bps bps)
(setq vlf-batch-size (* (1+ idx) vlf-tune-step) (setq best-idx idx
none-missing nil)) best-bps bps)))
((< best-bps bps) (setq best-idx idx
best-bps bps))))
(setq idx (1+ idx))) (setq idx (1+ idx)))
(if none-missing (setq vlf-batch-size (* (1+ best-idx) vlf-tune-step))))
(setq vlf-batch-size (* (1+ best-idx) vlf-tune-step)))))
(defun vlf-tune-batch (types &optional linear file) (defun vlf-tune-batch (types &optional linear file)
"Adjust `vlf-batch-size' to optimal value optimizing on TYPES. "Adjust `vlf-batch-size' to optimal value optimizing on TYPES.