sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-01-31 02:00:47 +00:00
Code Issues Releases Wiki Activity

Add vlf-batch-size tuning in vlf-occur.

Browse Source
This commit is contained in:
Andrey Kotlarski 2014-09-04 03:34:27 +03:00
parent 5379943cd7
commit 70a81077ab
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
vlf-occur.el
View File

@ -182,26 +182,31 @@ Prematurely ending indexing will still show what's found so far."
(defun vlf-build-occur (regexp vlf-buffer) (defun vlf-build-occur (regexp vlf-buffer)
"Build occur style index for REGEXP over VLF-BUFFER." "Build occur style index for REGEXP over VLF-BUFFER."
(let ((tramp-verbose (if (boundp 'tramp-verbose) (let* ((tramp-verbose (if (boundp 'tramp-verbose)
(min tramp-verbose 2))) (min tramp-verbose 2)))
(case-fold-search t) (case-fold-search t)
(line 1) (line 1)
(last-match-line 0) (last-match-line 0)
(last-line-pos (point-min)) (last-line-pos (point-min))
(total-matches 0) (total-matches 0)
(match-end-pos (+ vlf-start-pos (position-bytes (point)))) (match-end-pos (+ vlf-start-pos (position-bytes (point))))
(occur-buffer (generate-new-buffer (occur-buffer (generate-new-buffer
(concat "*VLF-occur " (file-name-nondirectory (concat "*VLF-occur " (file-name-nondirectory
buffer-file-name) buffer-file-name)
"*"))) "*")))
(line-regexp (concat "\\(?5:[\n\C-m]\\)\\|\\(?10:" (line-regexp (concat "\\(?5:[\n\C-m]\\)\\|\\(?10:"
regexp "\\)")) regexp "\\)"))
(batch-step (/ vlf-batch-size 8)) (batch-step (min 1024 (/ vlf-batch-size 8)))
(is-hexl (derived-mode-p 'hexl-mode)) (is-hexl (derived-mode-p 'hexl-mode))
(end-of-file nil) (end-of-file nil)
(reporter (make-progress-reporter (time (float-time))
(concat "Building index for " regexp "...") (tune-types (let ((base '(:insert :encode)))
vlf-start-pos vlf-file-size))) (if is-hexl
(nconc '(:hexl :dehexlify) base)
base)))
(reporter (make-progress-reporter
(concat "Building index for " regexp "...")
vlf-start-pos vlf-file-size)))
(with-current-buffer occur-buffer (with-current-buffer occur-buffer
(setq buffer-undo-list t)) (setq buffer-undo-list t))
(unwind-protect (unwind-protect
@ -254,6 +259,7 @@ Prematurely ending indexing will still show what's found so far."
total-matches)))))))) total-matches))))))))
(setq end-of-file (= vlf-end-pos vlf-file-size)) (setq end-of-file (= vlf-end-pos vlf-file-size))
(unless end-of-file (unless end-of-file
(vlf-tune-best tune-types)
(let ((batch-move (- vlf-end-pos batch-step))) (let ((batch-move (- vlf-end-pos batch-step)))
(vlf-move-to-batch (if (or is-hexl (vlf-move-to-batch (if (or is-hexl
(< match-end-pos (< match-end-pos
@ -273,7 +279,8 @@ Prematurely ending indexing will still show what's found so far."
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(if (zerop total-matches) (if (zerop total-matches)
(progn (kill-buffer occur-buffer) (progn (kill-buffer occur-buffer)
(message "No matches for \"%s\"" regexp)) (message "No matches for \"%s\" (%f secs)"
regexp (- (float-time) time)))
(let ((file buffer-file-name) (let ((file buffer-file-name)
(dir default-directory)) (dir default-directory))
(with-current-buffer occur-buffer (with-current-buffer occur-buffer
@ -291,7 +298,9 @@ in file: %s" total-matches line regexp file)
vlf-occur-regexp regexp vlf-occur-regexp regexp
vlf-occur-hexl is-hexl vlf-occur-hexl is-hexl
vlf-occur-lines line))) vlf-occur-lines line)))
(display-buffer occur-buffer))))) (display-buffer occur-buffer)
(message "Occur finished for \"%s\" (%f secs)"
regexp (- (float-time) time))))))
;; save, load vlf-occur data ;; save, load vlf-occur data