Le 14/05/2017 à 19:48, Stephan Witt a écrit :
Am 13.05.2017 um 08:19 schrieb Guillaume MM <g...@lyx.org>:
Le 11/05/2017 à 09:59, Stephan Witt a écrit :
The delay is defined in Buffer::Impl::blockFileMonitor (Buffer.cpp:388)
currently at 10ms. Can you try to increase this value and see if that
helps? It will likely help, but this is not a nice solution.
I tried it with a delay of 100ms. The effect is now LyX presents the external
modification message box every 2nd or 3rd save. So it is not the solution.
Thanks for the test, this helps. BTW is there a delay before the message
appears and if so how long? Do you see the following error message with
the files debug flag:
LYXERR(Debug::FILES, "Could not add path to QFileSystemWatcher: " <<
filename_);
?
This is the output of the un-patched LyX on save with false-positive message:
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile12.lyx" 3874605062 lasted 1 ms.
support/TempFile.cpp (35): Temporary file in
/Users/stephan/Documents/newfile12-XXXXXX.lyx
support/TempFile.cpp (38): Temporary file
`/Users/stephan/Documents/newfile12-P37773.lyx' created.
Buffer.cpp (1435): Saving to /Users/stephan/Documents/newfile12-P37773.lyx
BufferParams.cpp (321): Checking whether document is in a system dir... no
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile12.lyx" 3874605062 lasted 1 ms.
Buffer.cpp (1461): Backing up original file to
/Users/stephan/Documents/newfile12.lyx~
support/FileName.cpp (267): Moving /Users/stephan/Documents/newfile12.lyx~ to
/Users/stephan/Documents/newfile12.lyx
support/FileName.cpp (267): Moving /Users/stephan/Documents/newfile12.lyx to
/Users/stephan/Documents/newfile12-P37773.lyx
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile12.lyx" 2474078819 lasted 1 ms.
Thanks, this is as expected. Can I ask again, is there a delay between
saving and the time when the notification appears, and if so how long?
Can you please try the attached patch?
This is the output of the patched one - no false-positive message:
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile13.lyx" 2101337338 lasted 0 ms.
support/TempFile.cpp (35): Temporary file in
/Users/stephan/Documents/newfile13-XXXXXX.lyx
support/TempFile.cpp (38): Temporary file
`/Users/stephan/Documents/newfile13-B38676.lyx' created.
Buffer.cpp (1435): Saving to /Users/stephan/Documents/newfile13-B38676.lyx
BufferParams.cpp (321): Checking whether document is in a system dir... no
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile13.lyx" 2101337338 lasted 1 ms.
Buffer.cpp (1461): Backing up original file to
/Users/stephan/Documents/newfile13.lyx~
support/FileName.cpp (267): Moving /Users/stephan/Documents/newfile13.lyx~ to
/Users/stephan/Documents/newfile13.lyx
support/FileName.cpp (267): Moving /Users/stephan/Documents/newfile13.lyx to
/Users/stephan/Documents/newfile13-B38676.lyx
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile13.lyx" 834715601 lasted 2 ms.
support/FileName.cpp (605): Checksumming
"/Users/stephan/Documents/newfile13.lyx" 834715601 lasted 0 ms.
Thanks for testing. Again the trace is as expected. Good to know that it
works.
And this is for a big document (on a SSD based machine):
support/FileName.cpp (605): Checksumming
"/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx" 1327983642 lasted 35 ms.
support/TempFile.cpp (35): Temporary file in
/Users/stephan/git/lyx/lib/doc/de/UserGuide-XXXXXX.lyx
support/TempFile.cpp (38): Temporary file
`/Users/stephan/git/lyx/lib/doc/de/UserGuide-X38676.lyx' created.
Buffer.cpp (1435): Saving to
/Users/stephan/git/lyx/lib/doc/de/UserGuide-X38676.lyx
BufferParams.cpp (315): Checking whether document is in a system dir... yes
support/FileName.cpp (605): Checksumming
"/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx" 1327983642 lasted 37 ms.
Buffer.cpp (1461): Backing up original file to
/Users/stephan/git/lyx/lib/doc/de/UserGuide-lyxformat-541.lyx~
support/FileName.cpp (267): Moving
/Users/stephan/git/lyx/lib/doc/de/UserGuide-lyxformat-541.lyx~ to
/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx
support/FileName.cpp (267): Moving
/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx to
/Users/stephan/git/lyx/lib/doc/de/UserGuide-X38676.lyx
support/FileName.cpp (605): Checksumming
"/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx" 582248824 lasted 35 ms.
support/FileName.cpp (605): Checksumming
"/Users/stephan/git/lyx/lib/doc/de/UserGuide.lyx" 582248824 lasted 37 ms.
Good to know that the time to check the sum is reasonable for a big
document. For slow file systems one can expect the OS cache to help in
this precise situation.
The best solution would be to reimplement the saving with QSaveFile
+ Safer save mechanism
- Not sure it fixes the bug
- Requires some work
Alternatively, the patch that you just tested:
+ Fixes the bug and probably #10642 too
? Only warns if the contents have really changed, not the just the
attributes (unlike gedit for instance)
- Causes a second check of the sum on OSX
- Does not fix the FileMonitorBlocker for the future
- Does not fix the delay of 100+ ms before the file is actually saved
and does not ensure that it is synced.
Any opinion?
Guillaume
