Commit graph

10563 commits

Author SHA1 Message Date
Joey Hess
04d8a26afe Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-25 09:44:12 -04:00
2001:980:45c4:1:84e8:c853:c73d:5c6b
be45339a92 poll vote (/sdcard/annex) 2013-04-25 11:51:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8wY171R5c4u_jPmB6LU6n6Px2xePM4sE
fe42bbdde2 2013-04-25 09:17:14 +00:00
62.207.88.33
e90bde6764 poll vote (/sdcard/annex) 2013-04-25 08:08:04 +00:00
Richard Hartmann
bce17baada Typo 2013-04-25 08:52:22 +02:00
Joey Hess
362ed9f0e3 use DList for the transfer queue
Some nice efficiency gains here for list appending, although mostly
the small size of the transfer queue makes them irrelivant.
2013-04-25 01:33:44 -04:00
Joey Hess
c6da464051 use a DList for the deferred downloads queue 2013-04-25 01:26:23 -04:00
Joey Hess
82a6db8fe8 committer tweak to wait for Watcher to resume after a max-size commit
Without this, a very large batch add has commits of sizes approx
5000, 2500, 1250, etc down to 10, and then starts over at 5000.
This fixes it so it's 5000+ every time.
2013-04-25 00:48:09 -04:00
http://joeyh.name/
5775040cf6 Added a comment 2013-04-25 02:18:56 +00:00
http://joeyh.name/
349212bd7f Added a comment 2013-04-25 02:14:18 +00:00
Joey Hess
49547ad32d initremote: If two existing remotes have the same name, prefer the one with a higher trust level. 2013-04-24 21:53:58 -04:00
Joey Hess
4f4b2b01fa Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-24 21:21:18 -04:00
Joey Hess
a9081ae473 optimise direct mode startup scan
A recent change made existing symlinks be re-staged. That does not need to
be done during the startup scan though.
2013-04-24 21:20:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
35ca7533b3 Added a comment 2013-04-25 01:18:00 +00:00
Joey Hess
46529c0129 assistant: Sanitize XMPP presence information logged for debugging. 2013-04-24 21:13:10 -04:00
http://joeyh.name/
f0797d4701 Added a comment 2013-04-25 00:50:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
4d8f1bce42 Added a comment 2013-04-25 00:21:00 +00:00
http://joeyh.name/
57635f7783 Added a comment 2013-04-24 23:56:54 +00:00
http://joeyh.name/
2d15ec3f64 Added a comment 2013-04-24 23:46:11 +00:00
http://keverets.livejournal.com/
0a92a0a91d Added a comment: Your users aren't horses, either 2013-04-24 23:42:45 +00:00
Joey Hess
affb89a699 blog for the day 2013-04-24 18:57:52 -04:00
Joey Hess
ebee93a837 get rid of need to run pre-commit hook when assistant commits in direct mode
That hook updates associated file bookkeeping info for direct mode.
But, everything already called addAssociatedFile when adding/changing a
file. It only needed to also call removeAssociatedFile when deleting a file,
or a directory.

This should make bulk adds faster, by some possibly significant amount.
Bulk removals may be a little slower, since it has to use catKeyFile now
on each removed file, but will still be faster than adds.
2013-04-24 18:04:59 -04:00
Joey Hess
cb575cbe91 fix bda237f14a
Converted back to the wrong type, oops.
2013-04-24 17:50:11 -04:00
Joey Hess
b8e45ec9d7 refactoring and minor performance tweak 2013-04-24 17:46:46 -04:00
Joey Hess
7fa2d255da remove last use of TSet 2013-04-24 17:16:04 -04:00
Joey Hess
e9441ffe8e Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-24 17:06:25 -04:00
http://joeyh.name/
90e6c4e10c Added a comment 2013-04-24 21:02:55 +00:00
Joey Hess
cd7055631f batch commit every 5 thousand changes, not 10 thousand
There's a tradeoff between making less frequent commits, and
needing to use memory to store all the changes that are coming
in. At 10 thousand, it needs 150 mb of memory. 5 thousand drops
that down to 90 mb or so.

This also turns out to have significant imact on total run time.
I benchmarked 10k changes taking 27 minutes. But two 5k batches
took only 21 minutes.
2013-04-24 16:40:35 -04:00
Joey Hess
bda237f14a convert PendingAddChange back to Change when an add fails
If an add failed, we should lose the KeySource, since it, presumably,
differs due to a change that was made to the file.

(The locked down file is already deleted.)
2013-04-24 16:29:25 -04:00
Joey Hess
76431520e4 use TList for ChangePool 2013-04-24 16:13:22 -04:00
Joey Hess
25aabf4ffe add TList, built on DList 2013-04-24 16:01:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
6dcf07a581 2013-04-24 19:07:23 +00:00
Joey Hess
28d4113832 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-24 13:28:05 -04:00
http://joeyh.name/
bdb753fa6d Added a comment 2013-04-24 17:26:39 +00:00
spwhitton
deddc31d26 Added a comment 2013-04-24 17:09:50 +00:00
Joey Hess
a435a88c56 changelog 2013-04-24 13:09:28 -04:00
Joey Hess
a929e6641a show one alert when bulk adding files
Turns out that a lot of the time spent in a bulk add was just updating the
add alert to rotate through each file that was added. Showing one alert
makes for a significant speedup.

Also, when the webapp is open, this makes it take quite a lot less cpu
during bulk adds.

Also, it lets the user know when a bulk add happened, which is sorta
nice..
2013-04-24 13:04:46 -04:00
Joey Hess
6e5c7520ff whups, I didn't mean to commit this, it was in to more quickly test out of limit behavior 2013-04-24 11:52:24 -04:00
Joey Hess
958cf53394 add 2013-04-24 11:47:55 -04:00
Joey Hess
312f091b1c Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-24 11:47:35 -04:00
Joey Hess
01bedb54c6 improve display of multiline messages in alerts
This better handles error messages formatted for console display, by
adding a <br> after each line.

Hmm, I wonder if it'd be worth pulling in a markdown formatter, and running
the messages through it?
2013-04-24 11:45:41 -04:00
http://joeyh.name/
c9bb38c6a5 Added a comment 2013-04-24 15:30:04 +00:00
Joey Hess
e72f0b2898 only show latest warning, rather than combining warning alerts
In the case of the inotify limit warning, particularly, if it happens once
it will be happening repeatedly, and so combining alerts resulted in a
much too large alert message that took up a lot of memory and was too
large for the webapp to display.
2013-04-24 11:27:30 -04:00
Joey Hess
9f305483b0 typo; the inotify default limit is 8192, not 81920 2013-04-24 11:13:07 -04:00
Joey Hess
0392eb1f46 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-24 11:09:07 -04:00
Joey Hess
25c8258225 fix build 2013-04-24 11:08:35 -04:00
http://joeyh.name/
cbfb5493c0 Added a comment 2013-04-24 15:05:33 +00:00
Joey Hess
10fc9bc667 fix build 2013-04-24 10:48:06 -04:00
Joey Hess
47751372fb include sys/types.h
I have a report that this is necessary for freebsd.
It seemed not necessary for OSX, but even there the kqueue
man page says to include this header (along with sys/time.h
which it already does).
2013-04-24 10:39:52 -04:00
Joey Hess
3233e0fb60 revert addition of Includes: sys/event.h in cabal file
That is very dodgy; it makes *every* C file compiled have that header added
to it. Apparently sys/event.h needs some other header files to be included
on some OS's, and so this leads to compile failures in completely unrelated
places to the code that actually uses sys/event.h

This reverts commit c993d8e710, which added
this with no rationalle and I must have missed in amoung the other patches
when merging.

Also, Utility/kqueue.c already includes sys/event.h
2013-04-24 10:35:09 -04:00