Compare commits
113 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa9715b4f8 | ||
|
|
12250bb7a3 | ||
|
|
a44c7e1bd6 | ||
|
|
5e79e740bd | ||
|
|
15615e9b4d | ||
|
|
0bc6db578b | ||
|
|
12667ef6fa | ||
|
|
f4ae7d8d01 | ||
|
|
283e86d754 | ||
|
|
df7757b110 | ||
|
|
e32168b44b | ||
|
|
6bbe98b1dd | ||
|
|
82a9c4d42e | ||
|
|
4a230286b3 | ||
|
|
8fdf1b8b7a | ||
|
|
1905edf000 | ||
|
|
9ae3422246 | ||
|
|
c386404dd5 | ||
|
|
eaf5c9ffd2 | ||
|
|
d04e123ca6 | ||
|
|
00dc442fce | ||
|
|
164e34061d | ||
|
|
256d6e6bca | ||
|
|
4a1c0826f8 | ||
|
|
d3cd266b3e | ||
|
|
4986d7ceef | ||
|
|
21142c2193 | ||
|
|
4f0d44fc33 | ||
|
|
bdf34533f6 | ||
|
|
403807899e | ||
|
|
e01e977a66 | ||
|
|
80969d19f9 | ||
|
|
9d9b7a0681 | ||
|
|
7fcedddeeb | ||
|
|
4a9419b1ee | ||
|
|
4545803963 | ||
|
|
a9fa31c99b | ||
|
|
de6529aada | ||
|
|
d733ada21a | ||
|
|
9a7b86f550 | ||
|
|
3ac6c9336a | ||
|
|
ad90e2db8d | ||
|
|
c87bc4acff | ||
|
|
be2d6faa97 | ||
|
|
df56ab72ea | ||
|
|
cdf7f28d7a | ||
|
|
8ea1d08db8 | ||
|
|
900622082a | ||
|
|
0fabed9766 | ||
|
|
cd5ab741cb | ||
|
|
0cc9ddd815 | ||
|
|
29068e2496 | ||
|
|
770bfbf528 | ||
|
|
65db882952 | ||
|
|
20f19c80a8 | ||
|
|
03d5f755b3 | ||
|
|
dbbb6070e0 | ||
|
|
1672c7fb12 | ||
|
|
9feae04c99 | ||
|
|
3fbec6a217 | ||
|
|
c400c6a430 | ||
|
|
6039aad298 | ||
|
|
1cb67e8f68 | ||
|
|
d624e2e8d4 | ||
|
|
cad1b37140 | ||
|
|
d860bc0904 | ||
|
|
bf5b8d60aa | ||
|
|
8d6c1cd0ea | ||
|
|
efe921aff5 | ||
|
|
de3a853228 | ||
|
|
77e20ad55c | ||
|
|
ffa5c8bf64 | ||
|
|
ba47ccb680 | ||
|
|
e97b1bee52 | ||
|
|
24f43183fd | ||
|
|
0628cf9249 | ||
|
|
da879a098f | ||
|
|
eb010ec7f5 | ||
|
|
70fd411418 | ||
|
|
e2f1251c70 | ||
|
|
06ad11340d | ||
|
|
5c34457f2d | ||
|
|
7cdcba4a35 | ||
|
|
b30be14b3e | ||
|
|
3b8d510aeb | ||
|
|
9132c437fc | ||
|
|
7159bbb1fd | ||
|
|
ae9643f2ce | ||
|
|
6559e62276 | ||
|
|
1552fb8ec8 | ||
|
|
79d0b184b8 | ||
|
|
2793349268 | ||
|
|
4a7845dc7a | ||
|
|
978bbe4b40 | ||
|
|
0bd2b92237 | ||
|
|
be51d4c842 | ||
|
|
af2ac4b113 | ||
|
|
6dd7949030 | ||
|
|
a27f8221cd | ||
|
|
8cff776c5e | ||
|
|
bae9e8a0d8 | ||
|
|
bbfad5b9df | ||
|
|
fd24693c6b | ||
|
|
cc9d3595bd | ||
|
|
1b397d8976 | ||
|
|
8c06ad76b6 | ||
|
|
50b735d3a5 | ||
|
|
5660fcf7c5 | ||
|
|
e979c07600 | ||
|
|
cd7d1f9450 | ||
|
|
cdaceef840 | ||
|
|
6ce606977b | ||
|
|
fb72e811d0 |
75
README.md
75
README.md
@@ -1,69 +1,52 @@
|
|||||||
# MultiPar
|
# MultiPar
|
||||||
|
|
||||||
### v1.3.3.0 is public
|
### v1.3.3.5 is public
|
||||||
|
|
||||||
This is a testing version to improve speed of PAR2 calculation.
|
This is a minor update version.
|
||||||
Because the new method isn't tested so much, there may be a bug, failure, or mistake.
|
If there is no serious problem in this version,
|
||||||
Be careful to use this non-stable version.
|
next version will be the last of v1.3.3 tree.
|
||||||
When you don't want to test by yourself, you should not use this yet.
|
|
||||||
If you see a problem, please report the incident.
|
|
||||||
I will try to solve as possible as I can.
|
|
||||||
|
|
||||||
The PAR2 calculation speed may be 10% ~ 50% faster than old version.
|
It's difficult to support multi-monitor of different DPI.
|
||||||
The optimization depends on hardware environment.
|
Thanks [kwinz for reporting this problem](https://github.com/Yutaka-Sawada/MultiPar/issues/146).
|
||||||
I don't know what is the best setting on which PC.
|
Though I could not solve blurry window on multi-monitor case, users can see what it is.
|
||||||
From [many tests of debug versions](https://github.com/Yutaka-Sawada/MultiPar/issues/99),
|
|
||||||
it will select maybe better setting automatically.
|
|
||||||
Thanks testers for many trials.
|
|
||||||
If you want to compare speed of different settings on your PC, you may try those debug versions.
|
|
||||||
|
|
||||||
I changed GPU implementation largely, too.
|
I added an optional feature to set max size of recovery files directly.
|
||||||
To adopt CPU optimization, it will process smaller tasks on GPU.
|
For details, refer `Command_GUI.txt` and `Command_par2j.txt` in `help` folder of MultiPar.
|
||||||
Because GPU don't use CPU's cache, it's inefficient for GPU's task.
|
|
||||||
I don't know that new method is faster than old version or not.
|
|
||||||
|
|
||||||
Threshold to use GPU:
|
My web-pages on `vector.co.jp` disappered at 2024 December 20.
|
||||||
- Data size must be larger than 200 MB.
|
Thanks Vector to support MultiPar for long time.
|
||||||
- Block size must be larger than 64 KB.
|
I use [this GitHub page](https://github.com/Yutaka-Sawada/MultiPar) for MultiPar announcement.
|
||||||
- Number of source blocks must be more than 192.
|
|
||||||
- Number of recovery blocks must be more than 8.
|
|
||||||
|
|
||||||
Because [a user requested](https://github.com/Yutaka-Sawada/MultiPar/issues/102),
|
|
||||||
I implemented a way to add 5th item in "Media size" on Create window.
|
|
||||||
Write this line `MediaList4=name:size` under `[Option]` section in `MultiPar.ini`.
|
|
||||||
Currently, you cannot change the item on Option window.
|
|
||||||
|
|
||||||
|
|
||||||
[ Changes from 1.3.2.9 to 1.3.3.0 ]
|
[ Changes from 1.3.3.4 to 1.3.3.5 ]
|
||||||
|
|
||||||
|
Installer update
|
||||||
|
- Inno Setup was updated from v6.3.1 to v6.5.4.
|
||||||
|
|
||||||
GUI update
|
GUI update
|
||||||
- Change
|
- Change
|
||||||
- Option adapted to new "lc" settings.
|
- While it supports high DPI, it looks blurry on multi-monitor of different DPI.
|
||||||
- It's possible to add 5th item in "Media size" on Create window.
|
- It's possible to set maximum packet repetition from 1 time to 6 times.
|
||||||
|
|
||||||
PAR2 client update
|
PAR2 client update
|
||||||
- Change
|
- Change
|
||||||
- Max number of using threads is increased to 32.
|
- It's possible to set max size of recovery files directly.
|
||||||
- Threshold to use GPU was decreased.
|
|
||||||
|
|
||||||
- Improvement
|
|
||||||
- Matrix inversion may use more threads.
|
|
||||||
- L3 cache optimization was improved for recent CPUs.
|
|
||||||
|
|
||||||
|
|
||||||
[ Hash value ]
|
[ Hash value ]
|
||||||
|
|
||||||
MultiPar1330.zip
|
MultiPar1335.zip
|
||||||
MD5: 79570F84B74ECF8E5100561F7AAC3803
|
MD5: 22F3840CDCA56CDBFA39E872D337B460
|
||||||
SHA1: ACF7F164001708789C5D94003ED6B5C172235D54
|
SHA1: A332E230137F6BDF594CD0EB7B6A5130D1CFE71C
|
||||||
|
|
||||||
|
MultiPar1335_setup.exe
|
||||||
|
MD5: 2D178ED0E66C6AD0AE5C3507A6643EF5
|
||||||
|
SHA1: BA04FD62391351F0698B1BCAD384DD95DEA1E8C3
|
||||||
|
|
||||||
MultiPar1330_setup.exe
|
|
||||||
MD5: D1F1A5A4DF1C9EDD698C9A017AF31039
|
|
||||||
SHA1: 4C3314B909572A303EBBE8E015A2E813841CFA33
|
|
||||||
To install under "Program Files" or "Program Files (x86)" directory,
|
To install under "Program Files" or "Program Files (x86)" directory,
|
||||||
you must start the installer with administrative privileges by selecting
|
you must select "Install for all users" at the first dialog.
|
||||||
"Run as administrator" on right-click menu.
|
|
||||||
|
|
||||||
Old versions and source code packages are available at
|
Old versions and source code packages are available at
|
||||||
[GitHub](https://github.com/Yutaka-Sawada/MultiPar/releases) or
|
[GitHub](https://github.com/Yutaka-Sawada/MultiPar/releases) or
|
||||||
[OneDrive](https://1drv.ms/u/s!AtGhNMUyvbWOaSo1n_R8awJ_hg0).
|
[OneDrive](https://1drv.ms/f/c/8eb5bd32c534a1d1/QtGhNMUyvbUggI5pAAAAAAAAKjWf9HxrAn-GDQ).
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -25,7 +25,13 @@ Be careful to use those special features.
|
|||||||
|
|
||||||
[ System requirement ]
|
[ System requirement ]
|
||||||
|
|
||||||
MultiPar requires a PC with Windows Vista or later (Windows 7, 8, 10).
|
MultiPar requires a PC with Windows 7 or later (Windows 8, 10, 11).
|
||||||
|
|
||||||
|
[ Usage manual or Help documents ]
|
||||||
|
|
||||||
|
There are some usage manual or help documents in "help" folder.
|
||||||
|
English pages exists in "help/0409" folder.
|
||||||
|
You may open the manual by pushing "F1-key", while using MultiPar.
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
@@ -71,14 +77,13 @@ Don't send current PAR3 files to others, who may not have the same version.
|
|||||||
|
|
||||||
[ How to install or uninstall with installer package ]
|
[ How to install or uninstall with installer package ]
|
||||||
|
|
||||||
Double click setup file ( MultiPar131_setup.exe or something like this name ),
|
Double click setup file ( MultiPar133_setup.exe or something like this name ),
|
||||||
and follow the installer dialog.
|
and follow the installer dialog.
|
||||||
At version up, if you want to use previous setting, overwrite install is possible.
|
At version up, if you want to use previous setting, overwrite install is possible.
|
||||||
Before overwrite install, you should un-check "Integrate MultiPar into Shell".
|
Before overwrite install, you should un-check "Integrate MultiPar into Shell".
|
||||||
You may need to re-start OS after overwrite install or uninstall rarely.
|
You may need to re-start OS after overwrite install or uninstall rarely.
|
||||||
To install under "Program Files" or "Program Files (x86)" directory,
|
To install under "Program Files" or "Program Files (x86)" directory,
|
||||||
you must start the installer with administrative privileges by selecting
|
you must select "Install for all users" at the first dialog.
|
||||||
"Run as administrator" on right-click menu.
|
|
||||||
|
|
||||||
You can uninstall through the Windows OS's Control Panel,
|
You can uninstall through the Windows OS's Control Panel,
|
||||||
or double click unins000.exe in a folder which MultiPar was installed.
|
or double click unins000.exe in a folder which MultiPar was installed.
|
||||||
@@ -100,7 +105,7 @@ In either case, user made icons and association are available for the user only.
|
|||||||
|
|
||||||
[ How to install with archive version ]
|
[ How to install with archive version ]
|
||||||
|
|
||||||
Unpack compressed file ( MultiPar131.zip or something like this name ) in a folder.
|
Unpack compressed file ( MultiPar133.zip or something like this name ) in a folder.
|
||||||
MultiPar.exe is the interface of MultiPar.
|
MultiPar.exe is the interface of MultiPar.
|
||||||
|
|
||||||
You can create short-cut icon or send-to link at Option window later.
|
You can create short-cut icon or send-to link at Option window later.
|
||||||
@@ -141,9 +146,6 @@ so you need to move "MultiPar.ini" into the folder, too.
|
|||||||
They are written by Yutaka Sawada.
|
They are written by Yutaka Sawada.
|
||||||
Though console applications are open source (PAR clients are GPL),
|
Though console applications are open source (PAR clients are GPL),
|
||||||
GUI application is closed source.
|
GUI application is closed source.
|
||||||
Some article are available at my web site.
|
|
||||||
(URL: "https://hp.vector.co.jp/authors/VA021385/")
|
|
||||||
If you want source code, contact with me by e-mail.
|
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
@@ -169,10 +171,8 @@ mail server may delete it automatically, and I won't see it.
|
|||||||
|
|
||||||
[ Link ]
|
[ Link ]
|
||||||
|
|
||||||
I use Vector 's author page to introduce MultiPar.
|
You may download the latest version of MultiPar on GitHub.
|
||||||
(URL: "https://hp.vector.co.jp/authors/VA021385/")
|
(URL: "https://github.com/Yutaka-Sawada/MultiPar")
|
||||||
Because there is another official download page,
|
There is a Japanese download page on Vector.
|
||||||
(URL: "https://www.vector.co.jp/soft/dl/winnt/util/se460801.html")
|
(URL: "https://www.vector.co.jp/soft/dl/winnt/util/se460801.html")
|
||||||
using direct link to files on the page isn't preferable.
|
|
||||||
When you write a link on somewhere, please don't include filename.
|
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,13 @@ QuickPar など他の PAR クライアントはコメント機能に対応して
|
|||||||
|
|
||||||
[ 動作環境 ]
|
[ 動作環境 ]
|
||||||
|
|
||||||
Windows Vista かそれ以降 (Windows 7, 8, 10) のパソコンが必要です。
|
Windows 7 かそれ以降 (Windows 8, 10, 11) のパソコンが必要です。
|
||||||
|
|
||||||
|
[ 使い方や解説文章 ]
|
||||||
|
|
||||||
|
ほとんど英語ですが、help フォルダーの中に使い方や解説文章が入ってます。
|
||||||
|
日本語のページは help\0411 フォルダーの中にあります。
|
||||||
|
MultiPar の使用中に、F1-key を押すと、マニュアルが表示されます。
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
@@ -107,12 +113,14 @@ PAR 3.0 仕様のフォーマットは細部が流動的で最終版との互換
|
|||||||
|
|
||||||
[ インストーラー版のインストールとアンインストール ]
|
[ インストーラー版のインストールとアンインストール ]
|
||||||
|
|
||||||
インストーラー ( MultiPar131_setup.exe みたいな名前 ) をダブル・クリックすると、
|
インストーラー ( MultiPar133_setup.exe みたいな名前 ) をダブル・クリックすると、
|
||||||
インストール画面が表示されるので、その指示に従ってください。
|
インストール画面が表示されるので、その指示に従ってください。
|
||||||
バージョン・アップ時に、設定項目をそのまま使いたい時は上書きインストールしてもいいです。
|
バージョン・アップ時に、設定項目をそのまま使いたい時は上書きインストールしてもいいです。
|
||||||
上書きインストールする前に、「MultiPar をシェルに統合する」のチェックを外してください。
|
上書きインストールする前に、「MultiPar をシェルに統合する」のチェックを外してください。
|
||||||
上書きインストールやアンインストール後に OS の再起動を求められるかもしれません。
|
上書きインストールやアンインストール後に OS の再起動を求められるかもしれません。
|
||||||
「Program Files」や「Program Files (x86)」内にインストールするには、
|
「Program Files」や「Program Files (x86)」内にインストールするには、
|
||||||
|
最初のダイアログで「すべてのユーザー用にインストール」を選んでください。
|
||||||
|
|
||||||
右クリック・メニューの「管理者として実行」を選んで
|
右クリック・メニューの「管理者として実行」を選んで
|
||||||
管理者権限でインストーラーを開始する必要があります。
|
管理者権限でインストーラーを開始する必要があります。
|
||||||
|
|
||||||
@@ -137,7 +145,7 @@ MultiPar をインストールしたフォルダ内の unins000.exe をダブル
|
|||||||
|
|
||||||
[ アーカイブ版のインストール ]
|
[ アーカイブ版のインストール ]
|
||||||
|
|
||||||
配布されてる圧縮ファイル ( MultiPar131.zip みたいな名前 ) を解凍してできたファイルを
|
配布されてる圧縮ファイル ( MultiPar133.zip みたいな名前 ) を解凍してできたファイルを
|
||||||
どこか適当なフォルダに全て入れてください。
|
どこか適当なフォルダに全て入れてください。
|
||||||
その中の MultiPar.exe というのが MultiPar の実行ファイルです。
|
その中の MultiPar.exe というのが MultiPar の実行ファイルです。
|
||||||
それをダブル・クリックすると MultiPar が起動します。
|
それをダブル・クリックすると MultiPar が起動します。
|
||||||
@@ -211,9 +219,9 @@ GitHubのissueページに書き込んでもいいです。
|
|||||||
|
|
||||||
[ リンク ]
|
[ リンク ]
|
||||||
|
|
||||||
ベクターの作者ページでは外国人向けに MultiPar を紹介しています。
|
MultiPar の最新版は GitHub からダウンロードできます。
|
||||||
(URL: "https://hp.vector.co.jp/authors/VA021385/")
|
(URL: "https://github.com/Yutaka-Sawada/MultiPar")
|
||||||
ベクターの正式なダウンロード・ページは別にあります。
|
ベクターの日本語ダウンロード・ページもあります。
|
||||||
(URL: "https://www.vector.co.jp/soft/dl/winnt/util/se460801.html")
|
(URL: "https://www.vector.co.jp/soft/dl/winnt/util/se460801.html")
|
||||||
日本人向けにリンクを載せる際は、ベクターの作品紹介ページにしてください。
|
日本人向けにリンクを載せる際は、ベクターの作品紹介ページにしてください。
|
||||||
(URL: "https://www.vector.co.jp/soft/winnt/util/se460801.html")
|
(URL: "https://www.vector.co.jp/soft/winnt/util/se460801.html")
|
||||||
|
|||||||
@@ -1,5 +1,84 @@
|
|||||||
Release note of v1.3.3 tree
|
Release note of v1.3.3 tree
|
||||||
|
|
||||||
|
par2j's "lc" option was changed to support more threads.
|
||||||
|
Windows Vista was removed from supported OS.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.5 to 1.3.3.6 ] (2025/10/25)
|
||||||
|
|
||||||
|
GUI update
|
||||||
|
Change
|
||||||
|
GPU option is enabled always, even when GPU device doesn't exist.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.4 to 1.3.3.5 ] (2025/10/10)
|
||||||
|
|
||||||
|
Installer update
|
||||||
|
Inno Setup was updated from v6.3.1 to v6.5.4.
|
||||||
|
|
||||||
|
GUI update
|
||||||
|
Change
|
||||||
|
While it supports high DPI, it looks blurry on multi-monitor of different DPI.
|
||||||
|
It's possible to set maximum packet repetition from 1 time to 6 times.
|
||||||
|
|
||||||
|
PAR2 client update
|
||||||
|
Change
|
||||||
|
It's possible to set max size of recovery files directly.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.3 to 1.3.3.4 ] (2024/11/30)
|
||||||
|
|
||||||
|
Installer update
|
||||||
|
Korean language is available at installation.
|
||||||
|
|
||||||
|
GUI update
|
||||||
|
New
|
||||||
|
Korean language UI is added.
|
||||||
|
It's possible to add options for par2j on MultiPar.ini file.
|
||||||
|
|
||||||
|
Change
|
||||||
|
Link of Vector's author page is removed. Use GitHub's MultiPar page.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.2 to 1.3.3.3 ] (2024/06/15)
|
||||||
|
|
||||||
|
Installer update
|
||||||
|
Inno Setup was updated from v6.2.2 to v6.3.1.
|
||||||
|
|
||||||
|
PAR2 client update
|
||||||
|
Bug fix
|
||||||
|
Fixed a bug in GPU acceleration, when there are many OpenCL devices.
|
||||||
|
Failure of splitting source files with numerical extension was fixed.
|
||||||
|
Faulty prediction of the last block in a file with repeated data was fixed.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.1 to 1.3.3.2 ] (2024/01/10)
|
||||||
|
|
||||||
|
PAR2 client update
|
||||||
|
Improvement
|
||||||
|
GPU acceleration will work well on AMD graphics boards.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
[ Changes from 1.3.3.0 to 1.3.3.1 ] (2023/11/11)
|
||||||
|
|
||||||
|
Installer update
|
||||||
|
It shows dialog to select "per user" or "per machine" installation.
|
||||||
|
|
||||||
|
PAR2 client update
|
||||||
|
Change
|
||||||
|
Max number of threads to read files on SSD was increased to 6.
|
||||||
|
|
||||||
|
Improvement
|
||||||
|
GPU acceleration would become faster.
|
||||||
|
|
||||||
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ Changes from 1.3.2.9 to 1.3.3.0 ] (2023/10/10)
|
[ Changes from 1.3.2.9 to 1.3.3.0 ] (2023/10/10)
|
||||||
|
|
||||||
GUI update
|
GUI update
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
v1.3.3 の更新情報 (2023/10/10)
|
v1.3.3 の更新情報 (2025/10/10)
|
||||||
|
|
||||||
まだ動作実験中ですので、不安な人は前のバージョンを使ってください。
|
Windows Vista を動作対象の OS から外しました。
|
||||||
|
Vector のページが無くなるので、GitHub のページを使ってください。
|
||||||
|
https://github.com/Yutaka-Sawada/MultiPar
|
||||||
|
|
||||||
[ 1.3.2 から 1.3.3 への変更点 ]
|
[ 1.3.2 から 1.3.3 への変更点 ]
|
||||||
|
|
||||||
・クライアントの変更点
|
・クライアントの変更点
|
||||||
CPU Cache の利用方法を改善して速くなりました。
|
CPU Cache の利用方法を改善して速くなりました。
|
||||||
|
GPU による高速化も速くなりました。
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ textarea{width:100%;}
|
|||||||
|
|
||||||
<p> 
|
<p> 
|
||||||
Because MultiPar consists of PAR clients and GUI,
|
Because MultiPar consists of PAR clients and GUI,
|
||||||
it is possible to use a PAR client on Command prompt.
|
it is possible to use a PAR client on Command Prompt.
|
||||||
Read a manual of command line for the details of command and option.
|
Read a manual of command line for the details of command and option.
|
||||||
It's available by batch file (or command script).
|
It's available by batch file (or command script).
|
||||||
</p>
|
</p>
|
||||||
@@ -27,13 +27,57 @@ Modify the options for PAR2 files, and set the path of <tt>par2j.exe</tt>.
|
|||||||
Write absolute path like;<br>
|
Write absolute path like;<br>
|
||||||
<code>SET par2_path="C:\something directory\MultiPar\par2j.exe"</code><br>
|
<code>SET par2_path="C:\something directory\MultiPar\par2j.exe"</code><br>
|
||||||
Read manuals (<tt>Command_***.txt</tt>) to know the detail of options.
|
Read manuals (<tt>Command_***.txt</tt>) to know the detail of options.
|
||||||
Read Windows OS 's help for Command prompt's usage.
|
Read Windows OS 's help for Command Prompt's usage.
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
Save a sample script to a file like <tt>batch.bat</tt> or <tt>batch.cmd</tt>.
|
Save a sample script to a file like <tt>batch.bat</tt> or <tt>batch.cmd</tt>.
|
||||||
To specify path of files or folders, Drag & Drop them on the batch file.
|
There are some ways to specify a file or folder.<br>
|
||||||
When you put a shortcut icon of the batch file in "SendTo" menu,
|
<ol>
|
||||||
you can call the batch file by selecting files then Righ-Click & SendTo.
|
<li>Type everytime by keyboard on Command Prompt
|
||||||
|
<p> 
|
||||||
|
If you use the batch file at Command Prompt, change directory to the batch file at first.
|
||||||
|
Next, type <tt>batch.bat "path of the file or folder"</tt>.
|
||||||
|
If there is no space in the path, no need to cover by <tt>""</tt>.
|
||||||
|
The path may be absolute path or relative path from the batch file.
|
||||||
|
Normally absolute path would be safe.
|
||||||
|
</p>
|
||||||
|
<p> 
|
||||||
|
If you want to specify multiple files or folders,
|
||||||
|
type <tt>batch.bat "path of the first file or folder" "path of second file or folder" "path of third file or folder"</tt>.
|
||||||
|
You may add some pathes after a script filename.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li>Drag & Drop a file or folder by mouse
|
||||||
|
<p> 
|
||||||
|
On Windows Explorer, drag a file or folder and drop it on your batch file.
|
||||||
|
If you put the batch file on Desktop, it will be easy to Drag & Drop.
|
||||||
|
</p>
|
||||||
|
<p> 
|
||||||
|
If you want to specify multiple files or folders,
|
||||||
|
select them at once on Windows Explorer, and Drag & Drop the group on the batch file.
|
||||||
|
While dragging, number of items may be shown.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
<li>Select SendTo at Windows Explorer's right click menu
|
||||||
|
<p> 
|
||||||
|
At first, create Short-cut icon of your batch file.
|
||||||
|
Name it to be something easy to understand like "Create PAR2".
|
||||||
|
Then, put the Short-cut icon in your <tt>SendTo</tt> folder.
|
||||||
|
You can open the <tt>SendTo</tt> folder by typing <tt>shell:sendto</tt> on path-box of Windows Explorer.
|
||||||
|
</p>
|
||||||
|
<p> 
|
||||||
|
After you select a file or folder on Windows Explorer, click mouse's right button.
|
||||||
|
Select "SendTo" item on the right-click menu.
|
||||||
|
As your created Short-cut item will exist in the SendTo sub-menu, select the Short-cut icon.
|
||||||
|
</p>
|
||||||
|
<p> 
|
||||||
|
If you want to specify multiple files or folders,
|
||||||
|
select them at once on Windows Explorer.
|
||||||
|
While mouse cursor over there, click mouse's right button.
|
||||||
|
Later action is same as single item.
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
If you want to confirm the result of scripting,
|
If you want to confirm the result of scripting,
|
||||||
|
|||||||
@@ -13,13 +13,37 @@
|
|||||||
<p> 
|
<p> 
|
||||||
While MultiPar is available as freeware, I spent a lot of time and effort to develop.
|
While MultiPar is available as freeware, I spent a lot of time and effort to develop.
|
||||||
Your donation will encourage me to continue my efforts to improve and support MultiPar.
|
Your donation will encourage me to continue my efforts to improve and support MultiPar.
|
||||||
I made PayPal account and quick link for donation.<br>
|
I made PayPal account and quick link for donation.
|
||||||
<ol>
|
</p>
|
||||||
<li>Click <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NPNAKA32N4GD6" target="_blank" title="PayPal - The safer, easier way to pay online!">this link</a> to go PayPal's web-page.
|
|
||||||
<li>On left panel, you can change Quantity, and click Update to multiply the Amount.
|
<p>
|
||||||
<li>On right panel, you select your PayPal account or Credit card.
|
If you want to send message to me, use below web-form.
|
||||||
<li>You may write Message to developer at the bottom of right panel.
|
Select how much amount, write message, and click Doante button.
|
||||||
</ol>
|
<center>
|
||||||
|
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
|
||||||
|
<input type="hidden" name="cmd" value="_s-xclick">
|
||||||
|
<input type="hidden" name="hosted_button_id" value="2PP6DCPP5ZGNJ">
|
||||||
|
<table border=0 cellspacing=0 cellpadding=0>
|
||||||
|
<tr><td><input type="hidden" name="on0" value="How much">How much:<br>
|
||||||
|
<select name="os0">
|
||||||
|
<option value="Cheer">Cheer $10.00 USD</option>
|
||||||
|
<option value="Encouragement">Encouragement $20.00 USD</option>
|
||||||
|
<option value="Premium">Premium $30.00 USD</option>
|
||||||
|
<option value="Subsidy">Subsidy $40.00 USD</option>
|
||||||
|
<option value="Surprise">Surprise $50.00 USD</option>
|
||||||
|
</select></td><td>  </td>
|
||||||
|
<td><input type="hidden" name="on1" value="Short message">Short message:<br>
|
||||||
|
<input type="text" name="os1" maxlength="200" size="48"></td><td>  </td>
|
||||||
|
<td><input type="image" src="paypal.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"></td></tr>
|
||||||
|
</table>
|
||||||
|
<input type="hidden" name="currency_code" value="USD">
|
||||||
|
</form>
|
||||||
|
</center>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
If you don't write message, click <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NPNAKA32N4GD6" target="_blank" title="PayPal - The safer, easier way to pay online!">this link</a> to go PayPal's web-page.
|
||||||
|
You may change Quantity to multiply the total amount.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ There are command-line manuals in "<tt>help</tt>" folder.
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<small>last update 2023/06/13 for version 1.3.2.9</small>
|
<small>last update 2025/01/20 for version 1.3.3.5</small>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
BIN
alpha/help/0409/paypal.gif
Normal file
BIN
alpha/help/0409/paypal.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
@@ -173,16 +173,20 @@ It will verify each PAR2 set continuously.
|
|||||||
It's possible to stop queue on GUI.
|
It's possible to stop queue on GUI.
|
||||||
<tr><td>Script file<td><tt>queue_verify.py</tt>
|
<tr><td>Script file<td><tt>queue_verify.py</tt>
|
||||||
<tr><td>Caution<td>You must select MultiPar Option: "Re-use verification result" to be "For 3 days" or longer,
|
<tr><td>Caution<td>You must select MultiPar Option: "Re-use verification result" to be "For 3 days" or longer,
|
||||||
and you should check "Don't search subfolders" in "Verification and Repair options" section on "Client behavior" tab.
|
and you should check "Don't search subfolders" in "Verification and Repair options" section on "Client behavior" tab.
|
||||||
|
Furthermore, you must set proper <tt>save_path</tt> in the script.
|
||||||
</table>
|
</table>
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
In this sample, it tries verification only.
|
In this sample, it tries verification at first.
|
||||||
If you want to repair a damaged set automatically, use <tt>repair</tt> command instead of <tt>verify</tt> of par2j.
|
If you want to repair a damaged set automatically, check "Repair" item on the GUI panel.
|
||||||
When you want to confirm result by MultiPar, select a PAR2 set and push "Open with MultiPar" button.
|
When you want to confirm result by MultiPar, select a PAR2 set and push "Open with MultiPar" button.
|
||||||
You may repair on the MultiPar GUI.
|
You may repair on the MultiPar GUI manually.
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
|
After you start verification queue, you may stop next verification by pushing "Stop" button.
|
||||||
|
After the queue was stopped, you may re-start queue by pushing "Start" button again.
|
||||||
|
Or, you may select another folder by pushing "Folder" button.
|
||||||
While verification, it shows details on Command Prompt window.
|
While verification, it shows details on Command Prompt window.
|
||||||
You can control the progress by pushing a key on the Command Prompt.
|
You can control the progress by pushing a key on the Command Prompt.
|
||||||
You may pause the process by pushing P-key.
|
You may pause the process by pushing P-key.
|
||||||
@@ -193,7 +197,8 @@ Even when you stop the verification task, it may save result partially.
|
|||||||
<p> 
|
<p> 
|
||||||
When you push "Folder" button, it searches PAR2 sets in the selected folder.
|
When you push "Folder" button, it searches PAR2 sets in the selected folder.
|
||||||
By default, It doesn't search files recursively, because it may be slow.
|
By default, It doesn't search files recursively, because it may be slow.
|
||||||
If you want to search all sub-directories, you need to edit the script.
|
If you want to search all sub-directories, select "Recursive" item on the GUI panel.
|
||||||
|
While you don't start verification yet, you may select another folder by pushing "Stop" button.
|
||||||
You may change behavior of starting verification automatically or not by editing the script.
|
You may change behavior of starting verification automatically or not by editing the script.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,14 @@ Be careful to use those special features.
|
|||||||
|
|
||||||
<h3>System requirement</h3>
|
<h3>System requirement</h3>
|
||||||
<p> 
|
<p> 
|
||||||
MultiPar requires a PC with Windows Vista or later (Windows 7, 8, 10).
|
MultiPar requires a PC with Windows 7 or later (Windows 8, 10, 11).
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h3>Usage manual or Help documents</h3>
|
||||||
|
<p> 
|
||||||
|
There are some usage manual or help documents in "help" folder.
|
||||||
|
English pages exists in "help/0409" folder.
|
||||||
|
You may open the manual by pushing "F1-key", while using MultiPar.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -8,14 +8,13 @@
|
|||||||
|
|
||||||
<h3>Install or uninstall with installer package</h3>
|
<h3>Install or uninstall with installer package</h3>
|
||||||
<p> 
|
<p> 
|
||||||
Double click setup file ( <tt>MultiPar131_setup.exe</tt> or something like this name ),
|
Double click setup file ( <tt>MultiPar133_setup.exe</tt> or something like this name ),
|
||||||
and follow the installer dialog.
|
and follow the installer dialog.
|
||||||
At version up, if you want to use previous setting, overwrite install is possible.
|
At version up, if you want to use previous setting, overwrite install is possible.
|
||||||
Before overwrite install, you should un-check "Integrate MultiPar into Shell".
|
Before overwrite install, you should un-check "Integrate MultiPar into Shell".
|
||||||
You may need to re-start OS after overwrite install or uninstall rarely.
|
You may need to re-start OS after overwrite install or uninstall rarely.
|
||||||
To install under "<tt>Program Files</tt>" or "<tt>Program Files (x86)</tt>" directory,
|
To install under "<tt>Program Files</tt>" or "<tt>Program Files (x86)</tt>" directory,
|
||||||
you must start the installer with administrative privileges by selecting
|
you must select "Install for all users" at the first dialog.
|
||||||
"Run as administrator" on right-click menu.
|
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
You can uninstall through the Windows OS's Control Panel,
|
You can uninstall through the Windows OS's Control Panel,
|
||||||
@@ -42,7 +41,7 @@ In either case, user made icons and association are available for the user only.
|
|||||||
|
|
||||||
<h3>Install with archive version</h3>
|
<h3>Install with archive version</h3>
|
||||||
<p> 
|
<p> 
|
||||||
Unpack compressed file ( <tt>MultiPar131.zip</tt> or something like this name ) in a folder.
|
Unpack compressed file ( <tt>MultiPar133.zip</tt> or something like this name ) in a folder.
|
||||||
<tt>MultiPar.exe</tt> is the interface of MultiPar.
|
<tt>MultiPar.exe</tt> is the interface of MultiPar.
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
|
|||||||
@@ -13,9 +13,6 @@ MultiPar consists of PAR clients and GUI to control them.
|
|||||||
They are written by Yutaka Sawada.
|
They are written by Yutaka Sawada.
|
||||||
Though console applications are open source (PAR clients are GPL),
|
Though console applications are open source (PAR clients are GPL),
|
||||||
GUI application is closed source.
|
GUI application is closed source.
|
||||||
Some article are available at
|
|
||||||
<a href="https://hp.vector.co.jp/authors/VA021385/" target="_blank" title="Announcement page on Vector">my web site</a>.
|
|
||||||
There are source code packages on <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank" title="GitHub page">GitHub</a>.
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
@@ -42,10 +39,8 @@ mail server may delete it automatically, and I won't see it.
|
|||||||
|
|
||||||
<h3>Link</h3>
|
<h3>Link</h3>
|
||||||
<p> 
|
<p> 
|
||||||
I use <i>vector.co.jp</i>'s <a href="https://hp.vector.co.jp/authors/VA021385/" target="_blank" title="Announcement page on Vector">author page</a> to introduce MultiPar.
|
You may download the latest version of <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank">MultiPar on GitHub</a>.
|
||||||
Because there is another <a href="https://www.vector.co.jp/soft/dl/winnt/util/se460801.html" target="_blank" title="Download page on Vector">official download page</a>,
|
There is <a href="https://www.vector.co.jp/soft/dl/winnt/util/se460801.html" target="_blank">a Japanese download page on Vector</a>.
|
||||||
using direct link to files on the page isn't preferable.
|
|
||||||
When you write a link on somewhere, please don't include filename.
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
48
alpha/help/0411/donate.htm
Normal file
48
alpha/help/0411/donate.htm
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<html lang="ja">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
|
||||||
|
<link rel="stylesheet" href="style.css">
|
||||||
|
<title><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>̂<EFBFBD><EFBFBD>肢</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<font size=5><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>̂<EFBFBD><EFBFBD>肢</font>
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<h3>PayPal <20>ł̊<C582><CC8A>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>肢<EFBFBD><E882A2><EFBFBD>܂<EFBFBD></h3>
|
||||||
|
<p> 
|
||||||
|
MultiPar <20>͖<EFBFBD><CD96><EFBFBD><EFBFBD>ŗ<EFBFBD><C597>p<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A<EFBFBD>J<EFBFBD><4A><EFBFBD>ɂ͎<C982><CD8E>ԂƎ<D482><C68E>Ԃ<EFBFBD><D482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă܂<C482><DC82>B
|
||||||
|
<EFBFBD><EFBFBD><EFBFBD>t<EFBFBD><EFBFBD><EFBFBD>Ē<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƁA<EFBFBD>J<EFBFBD><EFBFBD><EFBFBD>𑱂<EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>͂<EFBFBD><EFBFBD>o<EFBFBD>܂<EFBFBD><EFBFBD>B
|
||||||
|
PayPal <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>ӂ<EFBFBD><D382><EFBFBD><EFBFBD>̂ŁA<C581><41><EFBFBD>Њ<EFBFBD><D08A>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>肢<EFBFBD><E882A2><EFBFBD>܂<EFBFBD><DC82>B
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<EFBFBD><EFBFBD><EFBFBD>z<EFBFBD><EFBFBD><EFBFBD>I<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>āA<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>Z<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>āADoante <20>{<7B>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
|
<center>
|
||||||
|
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
|
||||||
|
<input type="hidden" name="cmd" value="_s-xclick">
|
||||||
|
<input type="hidden" name="hosted_button_id" value="2PP6DCPP5ZGNJ">
|
||||||
|
<table border=0 cellspacing=0 cellpadding=0>
|
||||||
|
<tr><td><input type="hidden" name="on0" value="How much"><EFBFBD><EFBFBD><EFBFBD>z:<br>
|
||||||
|
<select name="os0">
|
||||||
|
<option value="Cheer">Cheer $10.00 USD</option>
|
||||||
|
<option value="Encouragement">Encouragement $20.00 USD</option>
|
||||||
|
<option value="Premium">Premium $30.00 USD</option>
|
||||||
|
<option value="Subsidy">Subsidy $40.00 USD</option>
|
||||||
|
<option value="Surprise">Surprise $50.00 USD</option>
|
||||||
|
</select></td><td>  </td>
|
||||||
|
<td><input type="hidden" name="on1" value="Short message"><EFBFBD><EFBFBD><EFBFBD>҂ւ̃<EFBFBD><EFBFBD>b<EFBFBD>Z<EFBFBD>[<5B>W:<br>
|
||||||
|
<input type="text" name="os1" maxlength="200" size="48"></td><td>  </td>
|
||||||
|
<td><input type="image" src="../0409/paypal.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"></td></tr>
|
||||||
|
</table>
|
||||||
|
<input type="hidden" name="currency_code" value="USD">
|
||||||
|
</form>
|
||||||
|
</center>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<EFBFBD>V<EFBFBD>@<40>\<5C>̎<EFBFBD><CC8E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>o<EFBFBD>O<EFBFBD>A<F18D9081><41><EFBFBD>P<EFBFBD>̏<EFBFBD><CC8F><EFBFBD><EFBFBD>ȂǁA<C781><41><EFBFBD>̌`<60>ł̍v<CC8D><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>肪<EFBFBD><E882AA><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
||||||
|
</p>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -37,6 +37,7 @@
|
|||||||
<a href="howto3.htm"><EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̐v</a><br>
|
<a href="howto3.htm"><EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̐v</a><br>
|
||||||
<a href="howto4.htm"><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̌<EFBFBD><CC8C><EFBFBD><EFBFBD>ƏC<C68F><43></a><br>
|
<a href="howto4.htm"><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̌<EFBFBD><CC8C><EFBFBD><EFBFBD>ƏC<C68F><43></a><br>
|
||||||
<a href="problem.htm"><EFBFBD><EFBFBD><EFBFBD>m<EFBFBD>̖<EFBFBD><EFBFBD><EFBFBD><EFBFBD>_</a><br>
|
<a href="problem.htm"><EFBFBD><EFBFBD><EFBFBD>m<EFBFBD>̖<EFBFBD><EFBFBD><EFBFBD><EFBFBD>_</a><br>
|
||||||
|
<a href="donate.htm"><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>̂<EFBFBD><EFBFBD>肢</a>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td colspan=3><font size=1> </font></td></tr>
|
<tr><td colspan=3><font size=1> </font></td></tr>
|
||||||
<tr valign="top"><td>
|
<tr valign="top"><td>
|
||||||
@@ -51,7 +52,7 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<small><EFBFBD>ŏI<EFBFBD>X<EFBFBD>V 2023/02/27 (<28>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> 1.3.2.8)</small>
|
<small><EFBFBD>ŏI<EFBFBD>X<EFBFBD>V 2025/01/21 (<28>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> 1.3.3.5)</small>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
BIN
alpha/help/0411/paypal.gif
Normal file
BIN
alpha/help/0411/paypal.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
@@ -25,7 +25,14 @@ QuickPar
|
|||||||
|
|
||||||
<h3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></h3>
|
<h3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></h3>
|
||||||
<p> 
|
<p> 
|
||||||
Windows Vista <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~ (Windows 7, 8, 10) <20>̃p<CC83>\<5C>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD><C582>B
|
Windows 7 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~ (Windows 8, 10, 11) <20>̃p<CC83>\<5C>R<EFBFBD><52><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD><C582>B
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h3><EFBFBD>g<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></h3>
|
||||||
|
<p> 
|
||||||
|
<EFBFBD>قƂ<EFBFBD><EFBFBD>ljp<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ahelp <20>t<EFBFBD>H<EFBFBD><48><EFBFBD>_<EFBFBD>[<5B>̒<EFBFBD><CC92>Ɏg<C98E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă܂<C482><DC82>B
|
||||||
|
<EFBFBD><EFBFBD><EFBFBD>{<7B><><EFBFBD>̃y<CC83>[<5B>W<EFBFBD><57> help\0411 <20>t<EFBFBD>H<EFBFBD><48><EFBFBD>_<EFBFBD>[<5B>̒<EFBFBD><CC92>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
||||||
|
MultiPar <20>̎g<CC8E>p<EFBFBD><70><EFBFBD>ɁAF1-key <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƁA<C681>}<7D>j<EFBFBD><6A><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -8,14 +8,13 @@
|
|||||||
|
|
||||||
<h3><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>[<5B>ł̃C<CC83><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>ƃA<C683><41><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><></h3>
|
<h3><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>[<5B>ł̃C<CC83><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>ƃA<C683><41><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><></h3>
|
||||||
<p> 
|
<p> 
|
||||||
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>[ ( <tt>MultiPar131_setup.exe</tt> <20>݂<EFBFBD><DD82><EFBFBD><EFBFBD>Ȗ<EFBFBD><C896>O ) <20><><EFBFBD>_<EFBFBD>u<EFBFBD><75><EFBFBD>E<EFBFBD>N<EFBFBD><4E><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>ƁA
|
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>[ ( <tt>MultiPar133_setup.exe</tt> <20>݂<EFBFBD><DD82><EFBFBD><EFBFBD>Ȗ<EFBFBD><C896>O ) <20><><EFBFBD>_<EFBFBD>u<EFBFBD><75><EFBFBD>E<EFBFBD>N<EFBFBD><4E><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>ƁA
|
||||||
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ʂ<EFBFBD><CA82>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁA<C581><41><EFBFBD>̎w<CC8E><77><EFBFBD>ɏ]<5D><><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ʂ<EFBFBD><CA82>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁA<C581><41><EFBFBD>̎w<CC8E><77><EFBFBD>ɏ]<5D><><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
<EFBFBD>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>A<EFBFBD>b<EFBFBD>v<EFBFBD><76><EFBFBD>ɁA<C981>ݒ荀<DD92>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>̂܂g<DC8E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͏㏑<CD8F><E38F91><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
<EFBFBD>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>A<EFBFBD>b<EFBFBD>v<EFBFBD><76><EFBFBD>ɁA<C981>ݒ荀<DD92>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>̂܂g<DC8E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͏㏑<CD8F><E38F91><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
||||||
<EFBFBD>㏑<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>ɁA<C981>uMultiPar <20><><EFBFBD>V<EFBFBD>F<EFBFBD><46><EFBFBD>ɓ<EFBFBD><C993><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>̃`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>O<EFBFBD><4F><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
<EFBFBD>㏑<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>ɁA<C981>uMultiPar <20><><EFBFBD>V<EFBFBD>F<EFBFBD><46><EFBFBD>ɓ<EFBFBD><C993><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>̃`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>O<EFBFBD><4F><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
<EFBFBD>㏑<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> OS <20>̍ċN<C48B><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82><EFBFBD><EFBFBD>邩<EFBFBD><E982A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
<EFBFBD>㏑<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD>C<EFBFBD><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> OS <20>̍ċN<C48B><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82><EFBFBD><EFBFBD>邩<EFBFBD><E982A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
||||||
<EFBFBD>u<tt>Program Files</tt><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>u<tt>Program Files (x86)</tt><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>ɃC<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ́A
|
<EFBFBD>u<tt>Program Files</tt><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>u<tt>Program Files (x86)</tt><EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>ɃC<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ́A
|
||||||
<EFBFBD>E<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><EFBFBD><EFBFBD>[<5B>́u<CC81>Ǘ<EFBFBD><C797>҂Ƃ<D282><C682>Ď<EFBFBD><C48E>s<EFBFBD>v<EFBFBD><76><EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD>
|
<EFBFBD>ŏ<EFBFBD><EFBFBD>̃_<EFBFBD>C<EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>Łu<EFBFBD><EFBFBD><EFBFBD>ׂẴ<EFBFBD><EFBFBD>[<5B>U<EFBFBD>[<5B>p<EFBFBD>ɃC<C983><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>v<EFBFBD><76><EFBFBD>I<EFBFBD><49><EFBFBD>ł<EFBFBD><C582><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
<EFBFBD>Ǘ<EFBFBD><EFBFBD>Ҍ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŃC<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD>[<5B><><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
<EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD> Windows OS <20>̃R<CC83><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><><EFBFBD>E<EFBFBD>p<EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>A
|
<EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><><EFBFBD><EFBFBD> Windows OS <20>̃R<CC83><52><EFBFBD>g<EFBFBD><67><EFBFBD>[<5B><><EFBFBD>E<EFBFBD>p<EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>A
|
||||||
@@ -43,7 +42,7 @@ MultiPar
|
|||||||
|
|
||||||
<h3><EFBFBD>A<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>ł̃C<CC83><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><></h3>
|
<h3><EFBFBD>A<EFBFBD>[<5B>J<EFBFBD>C<EFBFBD>u<EFBFBD>ł̃C<CC83><43><EFBFBD>X<EFBFBD>g<EFBFBD>[<5B><></h3>
|
||||||
<p> 
|
<p> 
|
||||||
<EFBFBD>z<EFBFBD>z<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă鈳<EFBFBD>k<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43> ( <tt>MultiPar131.zip</tt> <20>݂<EFBFBD><DD82><EFBFBD><EFBFBD>Ȗ<EFBFBD><C896>O ) <20><><EFBFBD>𓀂<EFBFBD><F0938082>Ăł<C482><C582><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>
|
<EFBFBD>z<EFBFBD>z<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă鈳<EFBFBD>k<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43> ( <tt>MultiPar133.zip</tt> <20>݂<EFBFBD><DD82><EFBFBD><EFBFBD>Ȗ<EFBFBD><C896>O ) <20><><EFBFBD>𓀂<EFBFBD><F0938082>Ăł<C482><C582><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD>
|
||||||
<EFBFBD>ǂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD><EFBFBD><EFBFBD>ȃt<EFBFBD>H<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>ɑS<EFBFBD>ē<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
<EFBFBD>ǂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD><EFBFBD><EFBFBD>ȃt<EFBFBD>H<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>ɑS<EFBFBD>ē<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̒<EFBFBD><EFBFBD><EFBFBD> <tt>MultiPar.exe</tt> <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>̂<EFBFBD> MultiPar <20>̎<EFBFBD><CC8E>s<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ł<EFBFBD><C582>B
|
<EFBFBD><EFBFBD><EFBFBD>̒<EFBFBD><EFBFBD><EFBFBD> <tt>MultiPar.exe</tt> <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD>̂<EFBFBD> MultiPar <20>̎<EFBFBD><CC8E>s<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ł<EFBFBD><C582>B
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MultiPar <20><><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MultiPar <20><><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ PAR
|
|||||||
<EFBFBD><EFBFBD><EFBFBD>̑<EFBFBD><EFBFBD>̃R<EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B><><EFBFBD>E<EFBFBD>A<EFBFBD>v<EFBFBD><76><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
<EFBFBD><EFBFBD><EFBFBD>̑<EFBFBD><EFBFBD>̃R<EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B><><EFBFBD>E<EFBFBD>A<EFBFBD>v<EFBFBD><76><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
GUI <20>A<EFBFBD>v<EFBFBD><76><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD> (<tt>MultiPar.exe</tt>) <20>͕<EFBFBD><CD95>ʂ̃t<CC83><74><EFBFBD>[<5B>\<5C>t<EFBFBD>g<EFBFBD>ł<EFBFBD><C582>B
|
GUI <20>A<EFBFBD>v<EFBFBD><76><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD> (<tt>MultiPar.exe</tt>) <20>͕<EFBFBD><CD95>ʂ̃t<CC83><74><EFBFBD>[<5B>\<5C>t<EFBFBD>g<EFBFBD>ł<EFBFBD><C582>B
|
||||||
MultiPar <20><><EFBFBD><EFBFBD><EFBFBD>̂܂g<DC8E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>A<EFBFBD><41><EFBFBD>ꂼ<EFBFBD><EA82BC><EFBFBD>̃<EFBFBD><CC83>C<EFBFBD>Z<EFBFBD><5A><EFBFBD>X<EFBFBD>̈Ⴂ<CC88><E182A2><EFBFBD>C<EFBFBD>ɂ<EFBFBD><C982>Ȃ<EFBFBD><C882>Ă<EFBFBD><C482><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
MultiPar <20><><EFBFBD><EFBFBD><EFBFBD>̂܂g<DC8E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>A<EFBFBD><41><EFBFBD>ꂼ<EFBFBD><EA82BC><EFBFBD>̃<EFBFBD><CC83>C<EFBFBD>Z<EFBFBD><5A><EFBFBD>X<EFBFBD>̈Ⴂ<CC88><E182A2><EFBFBD>C<EFBFBD>ɂ<EFBFBD><C982>Ȃ<EFBFBD><C882>Ă<EFBFBD><C482><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank" title="GitHub page">GitHub</a><EFBFBD>ɒu<EFBFBD><EFBFBD><EFBFBD>Ă܂<EFBFBD><EFBFBD>B
|
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68> <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank" title="GitHub page">GitHub</a> <EFBFBD>ɒu<EFBFBD><EFBFBD><EFBFBD>Ă܂<EFBFBD><EFBFBD>B
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
@@ -33,9 +33,9 @@ MultiPar
|
|||||||
|
|
||||||
<h3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N</h3>
|
<h3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N</h3>
|
||||||
<p> 
|
<p> 
|
||||||
<EFBFBD>x<EFBFBD>N<EFBFBD>^<5E>[<5B><><a href="https://hp.vector.co.jp/authors/VA021385/" target="_blank" title="<22>x<EFBFBD>N<EFBFBD>^<5E>[<5B>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>L<EFBFBD><4C><EFBFBD>y<EFBFBD>[<5B>W"><EFBFBD><EFBFBD><EFBFBD>҃y<EFBFBD>[<5B>W</a><EFBFBD>ł͊O<EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MultiPar <20><><EFBFBD>Љ<D089>Ă<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
MultiPar <20>̍ŐV<C590>ł<EFBFBD> <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank">GitHub <20><><EFBFBD><EFBFBD></a><EFBFBD>_<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
||||||
<EFBFBD>x<EFBFBD>N<EFBFBD>^<5E>[<5B><><a href="https://www.vector.co.jp/soft/dl/winnt/util/se460801.html" target="_blank" title="<22>x<EFBFBD>N<EFBFBD>^<5E>[<5B>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>_<EFBFBD>E<EFBFBD><45><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>E<EFBFBD>y<EFBFBD>[<5B>W"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȃ_<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>E<EFBFBD>y<EFBFBD>[<5B>W</a><EFBFBD>͕ʂɂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
<EFBFBD>x<EFBFBD>N<EFBFBD>^<5E>[<5B><><a href="https://www.vector.co.jp/soft/dl/winnt/util/se460801.html" target="_blank"><EFBFBD><EFBFBD><EFBFBD>{<7B><EFBFBD><EFBFBD>_<EFBFBD>E<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>E<EFBFBD>y<EFBFBD>[<5B>W</a><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
||||||
<EFBFBD><EFBFBD><EFBFBD>{<7B>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>Ƀ<EFBFBD><C983><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>ۂ́A<CD81>x<EFBFBD>N<EFBFBD>^<5E>[<5B><><a href="https://www.vector.co.jp/soft/winnt/util/se460801.html" target="_blank" title="<22>x<EFBFBD>N<EFBFBD>^<5E>[<5B>ɂ<EFBFBD><C982><EFBFBD><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>Љ<EFBFBD><D089>y<EFBFBD>[<5B>W"><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>Љ<EFBFBD><EFBFBD>y<EFBFBD>[<5B>W</a><EFBFBD>ɂ<EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
<EFBFBD><EFBFBD><EFBFBD>{<7B>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>Ƀ<EFBFBD><C983><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD>ۂ́A<CD81>x<EFBFBD>N<EFBFBD>^<5E>[<5B><><a href="https://www.vector.co.jp/soft/winnt/util/se460801.html" target="_blank"><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>Љ<EFBFBD><EFBFBD>y<EFBFBD>[<5B>W</a><EFBFBD>ɂ<EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -11,13 +11,37 @@
|
|||||||
|
|
||||||
<h3>PayPal捐赠</h3>
|
<h3>PayPal捐赠</h3>
|
||||||
<p> 
|
<p> 
|
||||||
尽管MultiPar可以免费使用,但我花了很多时间和精力来开发。您的捐款将鼓励我继续努力改进和支持MultiPar。我创建了PayPal帐户和捐款的快速链接。<br>
|
尽管MultiPar可以免费使用,但我花了很多时间和精力来开发。您的捐款将鼓励我继续努力改进和支持MultiPar。我创建了PayPal帐户和捐款的快速链接。
|
||||||
<ol>
|
</p>
|
||||||
<li>点击<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NPNAKA32N4GD6" target="_blank" title="PayPal - The safer, easier way to pay online!">此链接</a>转到PayPal的网页。
|
|
||||||
<li>在左侧面板上,您可以更改数量,然后单击更新以乘以金额。
|
<p>
|
||||||
<li>在右侧面板中,您可以选择PayPal帐户或信用卡。
|
If you want to send message to me, use below web-form.
|
||||||
<li>您可以在右侧面板底部向开发人员写消息。
|
Select how much amount, write message, and click Doante button.
|
||||||
</ol>
|
<center>
|
||||||
|
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
|
||||||
|
<input type="hidden" name="cmd" value="_s-xclick">
|
||||||
|
<input type="hidden" name="hosted_button_id" value="2PP6DCPP5ZGNJ">
|
||||||
|
<table border=0 cellspacing=0 cellpadding=0>
|
||||||
|
<tr><td><input type="hidden" name="on0" value="How much">How much:<br>
|
||||||
|
<select name="os0">
|
||||||
|
<option value="Cheer">Cheer $10.00 USD</option>
|
||||||
|
<option value="Encouragement">Encouragement $20.00 USD</option>
|
||||||
|
<option value="Premium">Premium $30.00 USD</option>
|
||||||
|
<option value="Subsidy">Subsidy $40.00 USD</option>
|
||||||
|
<option value="Surprise">Surprise $50.00 USD</option>
|
||||||
|
</select></td><td>  </td>
|
||||||
|
<td><input type="hidden" name="on1" value="Short message">Short message:<br>
|
||||||
|
<input type="text" name="os1" maxlength="200" size="48"></td><td>  </td>
|
||||||
|
<td><input type="image" src="../0409/paypal.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"></td></tr>
|
||||||
|
</table>
|
||||||
|
<input type="hidden" name="currency_code" value="USD">
|
||||||
|
</form>
|
||||||
|
</center>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
If you don't write message, 点击<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NPNAKA32N4GD6" target="_blank" title="PayPal - The safer, easier way to pay online!">此链接</a>转到PayPal的网页。
|
||||||
|
You may change Quantity to multiply the total amount.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<small>最新更新于2023年2月27日,适用于1.3.2.8版本,简体中文化 Deng Shiqing</small>
|
<small>最新更新于2025年01月20日,适用于1.3.3.5版本,简体中文化 Deng Shiqing</small>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
BIN
alpha/help/0804/paypal.gif
Normal file
BIN
alpha/help/0804/paypal.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
@@ -22,7 +22,7 @@ MultiPar支持PAR1.0和PAR2.0规范。请访问“<a href="http://parchive.sourc
|
|||||||
|
|
||||||
<h3>系统要求</h3>
|
<h3>系统要求</h3>
|
||||||
<p> 
|
<p> 
|
||||||
MultiPar需要电脑安装Windows Vista或更高的版本(Windows 7, 8, 10)。
|
MultiPar需要电脑安装Windows 7或更高的版本(Windows 8, 10, 11)。
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<h3>使用安装包安装或卸载</h3>
|
<h3>使用安装包安装或卸载</h3>
|
||||||
<p> 
|
<p> 
|
||||||
双击安装文件(<tt>MultiPar131_setup.exe</tt>或类似名称文件),然后按照安装程序对话框进行操作。在版本升级时,如果要使用先前的设置,可以进行覆盖安装。在覆盖安装之前, 应取消勾选“将MultiPar整合到右键菜单”。在写入安装或卸载之后,您可能需要重新启动操作系统。“<tt>Program Files</tt>”或“<tt>Program Files (x86)</tt>”目录下,必须在右键菜单上选择“以管理员身份运行”,用管理员权限启动安装程序。
|
双击安装文件(<tt>MultiPar133_setup.exe</tt>或类似名称文件),然后按照安装程序对话框进行操作。在版本升级时,如果要使用先前的设置,可以进行覆盖安装。在覆盖安装之前, 应取消勾选“将MultiPar整合到右键菜单”。在写入安装或卸载之后,您可能需要重新启动操作系统。要在“<tt>Program Files</tt>”或“<tt>Program Files (x86)</tt>”目录下安装,您必须在第一个对话框中选择“为所有用户安装”。
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
您可以通过Windows操作系统的控制面板卸载程序,或双击MultiPar安装文件夹中的<tt>unins000.exe</tt>。由于卸载程序不会删除设置文件或安装后新添加的文件,因此您可以自行删除它们。
|
您可以通过Windows操作系统的控制面板卸载程序,或双击MultiPar安装文件夹中的<tt>unins000.exe</tt>。由于卸载程序不会删除设置文件或安装后新添加的文件,因此您可以自行删除它们。
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
<h3>使用压缩包安装</h3>
|
<h3>使用压缩包安装</h3>
|
||||||
<p> 
|
<p> 
|
||||||
在文件夹中解压压缩文件(<tt>MultiPar131.zip</tt>或类似名称文件)。
|
在文件夹中解压压缩文件(<tt>MultiPar133.zip</tt>或类似名称文件)。
|
||||||
<tt>MultiPar.exe</tt>是MultiPar的启动程序。
|
<tt>MultiPar.exe</tt>是MultiPar的启动程序。
|
||||||
</p>
|
</p>
|
||||||
<p> 
|
<p> 
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<h3>许可证</h3>
|
<h3>许可证</h3>
|
||||||
<p> 
|
<p> 
|
||||||
MultiPar由PAR客户端和用于控制它们的图形用户界面(GUI)组成,由Yutaka Sawada编写。尽管控制台应用程序是开源的(PAR客户端采用GPL协议),但GUI程序是闭源的。有些文章可以在<a href="https://hp.vector.co.jp/authors/VA021385/" target="_blank" title="Announcement page on Vector">我的网站</a>上找到。
|
MultiPar由PAR客户端和用于控制它们的图形用户界面(GUI)组成,由Yutaka Sawada编写。尽管控制台应用程序是开源的(PAR客户端采用GPL协议),但GUI程序是闭源的。
|
||||||
There are source code packages on <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank" title="GitHub page">GitHub</a>.
|
There are source code packages on <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank" title="GitHub page">GitHub</a>.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ I use <a href="https://github.com/Yutaka-Sawada/MultiPar/issues" target="_blank"
|
|||||||
|
|
||||||
<h3>链接</h3>
|
<h3>链接</h3>
|
||||||
<p> 
|
<p> 
|
||||||
我在<a href="https://hp.vector.co.jp/authors/VA021385/" target="_blank" title="Announcement page on Vector">个人主页</a><i>vector.co.jp</i>有介绍MultiPar。使用这个页面上的文件直链可能不太合适,这还有一个<a href="https://www.vector.co.jp/soft/dl/winnt/util/se460801.html" target="_blank" title="Download page on Vector">官方下载页面</a>。当您在某处输入一个链接时,请不要包含文件名。
|
You may download the latest version of <a href="https://github.com/Yutaka-Sawada/MultiPar" target="_blank">MultiPar on GitHub</a>.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[ MultiPar GUI - version 1.3.3.0 or later ]
|
[ MultiPar GUI - version 1.3.3.4 or later ]
|
||||||
|
|
||||||
Usage: MultiPar.exe [command] [/base path] [/list path] [files]
|
Usage: MultiPar.exe [command] [/base path] [/list path] [files]
|
||||||
|
|
||||||
@@ -99,6 +99,11 @@ write a line of "RecoveryFileLimit=1" under "[Option]" section.
|
|||||||
It's same as an option:
|
It's same as an option:
|
||||||
"Variable (limited to size of largest data file)" on QuickPar.
|
"Variable (limited to size of largest data file)" on QuickPar.
|
||||||
|
|
||||||
|
If you want to limit size of Recovery Files by a specific value,
|
||||||
|
write a line of "RecoveryFileLimit=2" under "[Option]" section.
|
||||||
|
"Limit Size to" value is enabled, even when "Split Files" isn't checked.
|
||||||
|
This setting is useful, if you don't want to split source files.
|
||||||
|
|
||||||
If you want to enable "Most Resent Used List",
|
If you want to enable "Most Resent Used List",
|
||||||
write this line "MRUMax=5" under "[Path]" section.
|
write this line "MRUMax=5" under "[Path]" section.
|
||||||
You may change the number of items after "MRUMax=".
|
You may change the number of items after "MRUMax=".
|
||||||
@@ -112,6 +117,14 @@ Because the name and size are splitted by ":",
|
|||||||
you cannot include ":" in the name.
|
you cannot include ":" in the name.
|
||||||
The max size is 999999999999 bytes. (931 GB)
|
The max size is 999999999999 bytes. (931 GB)
|
||||||
|
|
||||||
|
If you want to add more options for par2j (par2j.exe or par2j64.exe),
|
||||||
|
write this line "par2jOption=/something" under "[Option]" section.
|
||||||
|
You may add multiple options like; "par2jOption=/m1 /lc32"
|
||||||
|
The total length must be less than 30 characters.
|
||||||
|
When you set an option at MultiPar's Option windows,
|
||||||
|
you should not set the same option on .INI file manually.
|
||||||
|
If you write wrong or strange text, par2j will fail.
|
||||||
|
|
||||||
|
|
||||||
Example of lines on "MultiPar.ini";
|
Example of lines on "MultiPar.ini";
|
||||||
|
|
||||||
@@ -121,5 +134,6 @@ RedundancyMax=10
|
|||||||
Sort=8
|
Sort=8
|
||||||
RecoveryFileLimit=1
|
RecoveryFileLimit=1
|
||||||
MediaList4=7.9GB DVD:8480000000
|
MediaList4=7.9GB DVD:8480000000
|
||||||
|
par2jOption=/lc32
|
||||||
[Path]
|
[Path]
|
||||||
MRUMax=5
|
MRUMax=5
|
||||||
|
|||||||
@@ -103,6 +103,16 @@ It means that it is impossible to mix "/" and "-" in options of same command lin
|
|||||||
If PAR file's filename (or relative path) is started by "-",
|
If PAR file's filename (or relative path) is started by "-",
|
||||||
you need to use "/" for prefix of options to distinguish PAR file.
|
you need to use "/" for prefix of options to distinguish PAR file.
|
||||||
|
|
||||||
|
When a option has arbitary number or text,
|
||||||
|
don't put space between the option and following part.
|
||||||
|
For example, setting "/rr1" is valid, but "/rr 1" is wrong.
|
||||||
|
Setting "/dPath" is valid, but "/d Path" is wrong.
|
||||||
|
|
||||||
|
To distinguish options from filenames, order of command-line arguments is important.
|
||||||
|
Put all options before <par file>.
|
||||||
|
Put <par file> before all [input files].
|
||||||
|
|
||||||
|
|
||||||
/f, /fu :
|
/f, /fu :
|
||||||
Set this, if you use file-list for file name or file path.
|
Set this, if you use file-list for file name or file path.
|
||||||
The file-list is a text file, which contains filenames in each line.
|
The file-list is a text file, which contains filenames in each line.
|
||||||
@@ -169,8 +179,10 @@ If you include space in comment, use "" to specify where is end.
|
|||||||
use this setting to set the path as base-directory.
|
use this setting to set the path as base-directory.
|
||||||
This is either absolute path or relative path from current directory.
|
This is either absolute path or relative path from current directory.
|
||||||
If you include space in path, use "" to specify where is end.
|
If you include space in path, use "" to specify where is end.
|
||||||
Note, setting "/dC:" is same as setting current directory of C-drive.
|
As you may omit the last "/" in path of a folder,
|
||||||
If you want to set direct root of C-drive, you must set "/dC:/".
|
both "/dC:/data/" and "/dC:/data" are valid.
|
||||||
|
Note, setting "/dD:" is same as setting current directory of D-drive.
|
||||||
|
If you want to set direct root of D-drive, you must set "/dD:/".
|
||||||
|
|
||||||
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[ par2j.exe - version 1.3.3.0 or later ]
|
[ par2j.exe - version 1.3.3.5 or later ]
|
||||||
|
|
||||||
Type "par2j.exe" to see version, test integrity, and show usage below.
|
Type "par2j.exe" to see version, test integrity, and show usage below.
|
||||||
|
|
||||||
@@ -148,6 +148,16 @@ It means that it is impossible to mix "/" and "-" in options of same command lin
|
|||||||
If PAR file's filename (or relative path) is started by "-",
|
If PAR file's filename (or relative path) is started by "-",
|
||||||
you need to use "/" for prefix of options to distinguish PAR file.
|
you need to use "/" for prefix of options to distinguish PAR file.
|
||||||
|
|
||||||
|
When a option has arbitary number or text,
|
||||||
|
don't put space between the option and following part.
|
||||||
|
For example, setting "/rr10" is valid, but "/rr 10" is wrong.
|
||||||
|
Setting "/dPath" is valid, but "/d Path" is wrong.
|
||||||
|
|
||||||
|
To distinguish options from filenames, order of command-line arguments is important.
|
||||||
|
Put all options before <par file>.
|
||||||
|
Put <par file> before all [input files] or [external files].
|
||||||
|
|
||||||
|
|
||||||
/f, /fu :
|
/f, /fu :
|
||||||
Set this, if you use file-list for file name or file path.
|
Set this, if you use file-list for file name or file path.
|
||||||
When this option is set, [input files] or [external files] is path of file-list.
|
When this option is set, [input files] or [external files] is path of file-list.
|
||||||
@@ -302,7 +312,7 @@ Because it may be difficult to predict recovery file size,
|
|||||||
use trial command to see how is the size.
|
use trial command to see how is the size.
|
||||||
When it's "/lr" or "/lr0", block count of the largest input file is used.
|
When it's "/lr" or "/lr0", block count of the largest input file is used.
|
||||||
(If the max file is 1000 KB and block size is 10 KB, /lr is same as /lr100.)
|
(If the max file is 1000 KB and block size is 10 KB, /lr is same as /lr100.)
|
||||||
When split size "/ls" is set with "/lr0",
|
When both "/lr0" and "/ls(split size)" are set,
|
||||||
block count of the splited file size is used instead of the largest input file.
|
block count of the splited file size is used instead of the largest input file.
|
||||||
|
|
||||||
for example, /lr , /lr10 , /lr2000
|
for example, /lr , /lr10 , /lr2000
|
||||||
@@ -354,6 +364,13 @@ This is possible, only when there is one input file of .ZIP or .7z format.
|
|||||||
When recovery files are created in a different directory,
|
When recovery files are created in a different directory,
|
||||||
the protected archive file is made in the directory.
|
the protected archive file is made in the directory.
|
||||||
|
|
||||||
|
/ls2 has a special feature to set limit size of recovery files directly.
|
||||||
|
When both "/ls2" and "/lr(limit size)" are set,
|
||||||
|
setting number of /lr is recognizned as file size instead of number of blocks.
|
||||||
|
In this usage, setting limit size must be less than 2 GB.
|
||||||
|
If you want max 100 MB each file size, set like these; /ls2 /lr102400000
|
||||||
|
Because the calculation ignores packets, you may set a bit smaller size.
|
||||||
|
|
||||||
for example, /ls10000 , /ls1048576, /ls1
|
for example, /ls10000 , /ls1048576, /ls1
|
||||||
|
|
||||||
/lc :
|
/lc :
|
||||||
@@ -367,16 +384,43 @@ The format is "/lc#" (# is from 1 to 32 as the number of using threads).
|
|||||||
253: It uses 3/4 number of physical Cores.
|
253: It uses 3/4 number of physical Cores.
|
||||||
254: It uses one less threads than number of physical Cores.
|
254: It uses one less threads than number of physical Cores.
|
||||||
0: It uses the number of physical Cores.
|
0: It uses the number of physical Cores.
|
||||||
255: It uses one more threads than number of physical Cores.
|
255: It tries to use more threads than number of physical Cores.
|
||||||
|
|
||||||
You may set additional combinations;
|
You may set additional combinations for CPU feature;
|
||||||
+1024 to disable CLMUL (and use old SSSE3 code),
|
+1024 to disable CLMUL (and use slower SSSE3 code)
|
||||||
+2048 to disable JIT (for SSE2),
|
+2048 to disable JIT (for SSE2)
|
||||||
+4096 to disable SSSE3,
|
+4096 to disable SSSE3
|
||||||
+8192 to disable AVX2,
|
+8192 to disable AVX2
|
||||||
+256 or +512 (slower device) to enable GPU acceleration.
|
|
||||||
|
|
||||||
for example, /lc1 to use single Core, /lc45 to use half Cores and GPU
|
You may set additional combinations for GPU control;
|
||||||
|
+256 or +512 (slower device) to enable GPU acceleration
|
||||||
|
+65536 for classic method
|
||||||
|
+131072 for 16-byte memory access
|
||||||
|
+262144 for 4-byte memory access and calculate 2 blocks at once
|
||||||
|
+524288 for 16-byte memory access and calculate 2 blocks at once
|
||||||
|
+1048576 for CL_MEM_COPY_HOST_PTR or +2097152 for CL_MEM_USE_HOST_PTR
|
||||||
|
(When you set exclusive bits, larger value will be used.)
|
||||||
|
|
||||||
|
for example, /lc1 to use single Core, /lc508 to use half Cores and GPU
|
||||||
|
|
||||||
|
/lcb :
|
||||||
|
This is for Cache Blocking. (CPU cache optimization)
|
||||||
|
By default, this value is set-associative size of CPU L2 cache.
|
||||||
|
Maximum value is 32767. It will be multipled by 64 KB.
|
||||||
|
To disable cache optimization, set "/lcb0".
|
||||||
|
|
||||||
|
/lcs :
|
||||||
|
This is for large buffer size at calculating multiple files' hashes.
|
||||||
|
By default, this value is set-associative size of CPU L3 cache.
|
||||||
|
Maximum value is 65535. It will be multipled by 64 KB.
|
||||||
|
When you set "/lcs0", large buffer size will become 2 MB by default.
|
||||||
|
|
||||||
|
/lcm :
|
||||||
|
This is for max number of chunks to calculate at once. (CPU shared cache optimization)
|
||||||
|
By default, this value may be rate of L3 cache size / L2 cache size.
|
||||||
|
The value may be changed by some factors in experimental results.
|
||||||
|
Maximum value is 32768. Lower values than 8 will be same as 32768.
|
||||||
|
To disable cache optimization, set "/lcm0".
|
||||||
|
|
||||||
/m :
|
/m :
|
||||||
Set this, if you want to set memory usage.
|
Set this, if you want to set memory usage.
|
||||||
@@ -447,8 +491,10 @@ If you include space in comment, use "" to specify where is end.
|
|||||||
use this setting to set the path as base-directory.
|
use this setting to set the path as base-directory.
|
||||||
This is either absolute path or relative path from current directory.
|
This is either absolute path or relative path from current directory.
|
||||||
If you include space in path, use "" to specify where is end.
|
If you include space in path, use "" to specify where is end.
|
||||||
Note, setting "/dC:" is same as setting current directory of C-drive.
|
As you may omit the last "/" in path of a folder,
|
||||||
If you want to set direct root of C-drive, you must set "/dC:/".
|
both "/dC:/data/" and "/dC:/data" are valid.
|
||||||
|
Note, setting "/dD:" is same as setting current directory of D-drive.
|
||||||
|
If you want to set direct root of D-drive, you must set "/dD:/".
|
||||||
|
|
||||||
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
||||||
|
|
||||||
|
|||||||
@@ -94,6 +94,16 @@ It means that it is impossible to mix "/" and "-" in options of same command lin
|
|||||||
If checksum file's filename (or relative path) is started by "-",
|
If checksum file's filename (or relative path) is started by "-",
|
||||||
you need to use "/" for prefix of options to distinguish checksum file.
|
you need to use "/" for prefix of options to distinguish checksum file.
|
||||||
|
|
||||||
|
When a option has arbitary number or text,
|
||||||
|
don't put space between the option and following part.
|
||||||
|
For example, setting "/vs1" is valid, but "/vs 1" is wrong.
|
||||||
|
Setting "/dPath" is valid, but "/d Path" is wrong.
|
||||||
|
|
||||||
|
To distinguish options from filenames, order of command-line arguments is important.
|
||||||
|
Put all options before <checksum file>.
|
||||||
|
Put <checksum file> before all [input files]
|
||||||
|
|
||||||
|
|
||||||
/fo :
|
/fo :
|
||||||
Set this, if you want to ignore folders at wildcard matching search.
|
Set this, if you want to ignore folders at wildcard matching search.
|
||||||
This setting disable recursive search into folder also.
|
This setting disable recursive search into folder also.
|
||||||
@@ -129,8 +139,10 @@ from the PAR client's directory, use this setting to set path.
|
|||||||
use this setting to set the path as base-directory.
|
use this setting to set the path as base-directory.
|
||||||
This is either absolute path or relative path from current directory.
|
This is either absolute path or relative path from current directory.
|
||||||
If you include space in path, use "" to specify where is end.
|
If you include space in path, use "" to specify where is end.
|
||||||
Note, setting "/dC:" is same as setting current directory of C-drive.
|
As you may omit the last "/" in path of a folder,
|
||||||
If you want to set direct root of C-drive, you must set "/dC:/".
|
both "/dC:/data/" and "/dC:/data" are valid.
|
||||||
|
Note, setting "/dD:" is same as setting current directory of D-drive.
|
||||||
|
If you want to set direct root of D-drive, you must set "/dD:/".
|
||||||
|
|
||||||
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Parchive 1.0 client by Yutaka Sawada
|
|||||||
You cannot specify Non-Recovery-Set files. (Empty files are set.)
|
You cannot specify Non-Recovery-Set files. (Empty files are set.)
|
||||||
Number of recovery files are limited to 99.
|
Number of recovery files are limited to 99.
|
||||||
|
|
||||||
This requires a PC of Windows Vista or later (Windows 7, 8, 10, 11).
|
This requires a PC of Windows 7 or later (Windows 8, 10, 11).
|
||||||
This is developed with Visual Studio 2022 on Windows 10.
|
This is developed with Visual Studio 2022 on Windows 10.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ Parchive 2.0 client by Yutaka Sawada
|
|||||||
Verifying file use same memory as the file or double of block size.
|
Verifying file use same memory as the file or double of block size.
|
||||||
Recovering block use more memory as the number of block is many.
|
Recovering block use more memory as the number of block is many.
|
||||||
|
|
||||||
This requires a PC of Windows Vista or later (Windows 7, 8, 10, 11).
|
This requires a PC of Windows 7 or later (Windows 8, 10, 11).
|
||||||
This is developed with Visual Studio 2022 on Windows 10.
|
This is developed with Visual Studio 2022 on Windows 10.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
BIN
alpha/par1j.exe
BIN
alpha/par1j.exe
Binary file not shown.
BIN
alpha/par2j.exe
BIN
alpha/par2j.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -43,25 +43,31 @@ def search_par_set(one_path):
|
|||||||
continue
|
continue
|
||||||
listbox_list1.insert(tk.END, base_name)
|
listbox_list1.insert(tk.END, base_name)
|
||||||
|
|
||||||
|
|
||||||
# Add found PAR sets in sub-directories
|
# Add found PAR sets in sub-directories
|
||||||
# This searches 1 level child only, because recursive search may be slow.
|
s_recursive = s_combo.get()
|
||||||
for par_path in glob.glob(glob.escape(one_path) + "/*/*.par2"):
|
if s_recursive != "No child":
|
||||||
# If you want to search recursively, use below line instead of above line.
|
if s_recursive == "Recursive":
|
||||||
#for par_path in glob.glob(glob.escape(one_path) + "/**/*.par2", recursive=True):
|
# This will search all sub-directories recursively.
|
||||||
# Get relative path and convert to UNIX style directory mark
|
search_path = glob.escape(one_path) + "/**/*.par2"
|
||||||
rel_path = os.path.relpath(par_path, one_path)
|
recursive_flag = True
|
||||||
rel_path = rel_path.replace('\\', '/')
|
else:
|
||||||
# Remove extension ".par2"
|
# This searches 1 level child only, because recursive search may be slow.
|
||||||
one_name = os.path.splitext(rel_path)[0]
|
search_path = glob.escape(one_path) + "/*/*.par2"
|
||||||
# Compare filename in case insensitive
|
recursive_flag = False
|
||||||
base_name = one_name.lower()
|
for par_path in glob.glob(search_path, recursive=recursive_flag):
|
||||||
# Remove ".vol#-#", ".vol#+#", or ".vol_#" at the last
|
# Get relative path and convert to UNIX style directory mark
|
||||||
base_name = re.sub(r'[.]vol\d*[-+_]\d+$', "", base_name)
|
rel_path = os.path.relpath(par_path, one_path)
|
||||||
# Ignore same base, if the name exists in the list already.
|
rel_path = rel_path.replace('\\', '/')
|
||||||
if "'" + base_name + "'" in s_list1.get():
|
# Remove extension ".par2"
|
||||||
continue
|
one_name = os.path.splitext(rel_path)[0]
|
||||||
listbox_list1.insert(tk.END, base_name)
|
# Compare filename in case insensitive
|
||||||
|
base_name = one_name.lower()
|
||||||
|
# Remove ".vol#-#", ".vol#+#", or ".vol_#" at the last
|
||||||
|
base_name = re.sub(r'[.]vol\d*[-+_]\d+$', "", base_name)
|
||||||
|
# Ignore same base, if the name exists in the list already.
|
||||||
|
if "'" + base_name + "'" in s_list1.get():
|
||||||
|
continue
|
||||||
|
listbox_list1.insert(tk.END, base_name)
|
||||||
|
|
||||||
item_count = listbox_list1.size()
|
item_count = listbox_list1.size()
|
||||||
one_name = os.path.basename(one_path)
|
one_name = os.path.basename(one_path)
|
||||||
@@ -70,13 +76,14 @@ def search_par_set(one_path):
|
|||||||
label_status.config(text= "There are no PAR sets in \"" + one_path + "\".")
|
label_status.config(text= "There are no PAR sets in \"" + one_path + "\".")
|
||||||
else:
|
else:
|
||||||
button_folder.config(state=tk.DISABLED)
|
button_folder.config(state=tk.DISABLED)
|
||||||
|
button_stop.config(state=tk.NORMAL)
|
||||||
button_open2.config(state=tk.DISABLED)
|
button_open2.config(state=tk.DISABLED)
|
||||||
button_open3.config(state=tk.DISABLED)
|
button_open3.config(state=tk.DISABLED)
|
||||||
|
combo_recursive.config(state=tk.DISABLED)
|
||||||
# If you want to start manually, use these lines instead of below lines.
|
# If you want to start manually, use these lines instead of below lines.
|
||||||
#label_status.config(text= str(item_count) + " sets were found in \"" + one_path + "\".")
|
label_status.config(text= str(item_count) + " sets were found in \"" + one_path + "\".")
|
||||||
button_start.config(state=tk.NORMAL)
|
button_start.config(state=tk.NORMAL)
|
||||||
# If you want to start verification automatically, use these lines instead of above lines.
|
# If you want to start verification automatically, use this line instead of above lines.
|
||||||
#button_stop.config(state=tk.NORMAL)
|
|
||||||
#root.after(100, queue_run)
|
#root.after(100, queue_run)
|
||||||
|
|
||||||
|
|
||||||
@@ -105,6 +112,8 @@ def queue_run():
|
|||||||
button_start.config(state=tk.NORMAL)
|
button_start.config(state=tk.NORMAL)
|
||||||
button_open2.config(state=tk.NORMAL)
|
button_open2.config(state=tk.NORMAL)
|
||||||
button_open3.config(state=tk.NORMAL)
|
button_open3.config(state=tk.NORMAL)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
check_repair.config(state=tk.NORMAL)
|
||||||
label_status.config(text= "Stopped queue")
|
label_status.config(text= "Stopped queue")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -120,9 +129,14 @@ def queue_run():
|
|||||||
label_status.config(text= "Verifying " + base_name)
|
label_status.config(text= "Verifying " + base_name)
|
||||||
|
|
||||||
# Set command-line
|
# Set command-line
|
||||||
# Cover path by " for possible space
|
# Cover path by " for possible space
|
||||||
cmd = "\"" + client_path + "\" v /fo /vs2 /vd\"" + save_path + "\" \"" + one_path + "\""
|
cmd = "\"" + client_path + "\" "
|
||||||
# If you want to repair a damaged set automatically, use "r" command instead of "v".
|
if i_check.get() == 0:
|
||||||
|
cmd += "v"
|
||||||
|
else:
|
||||||
|
# If you want to repair a damaged set automatically, use "r" command instead of "v".
|
||||||
|
cmd += "r"
|
||||||
|
cmd += " /fo /vs2 /vd\"" + save_path + "\" \"" + one_path + "\""
|
||||||
#print(cmd)
|
#print(cmd)
|
||||||
|
|
||||||
# Run PAR2 client
|
# Run PAR2 client
|
||||||
@@ -163,6 +177,8 @@ def queue_result():
|
|||||||
button_stop.config(state=tk.DISABLED)
|
button_stop.config(state=tk.DISABLED)
|
||||||
button_open2.config(state=tk.NORMAL)
|
button_open2.config(state=tk.NORMAL)
|
||||||
button_open3.config(state=tk.NORMAL)
|
button_open3.config(state=tk.NORMAL)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
check_repair.config(state=tk.NORMAL)
|
||||||
label_status.config(text= "Failed queue")
|
label_status.config(text= "Failed queue")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -173,6 +189,8 @@ def queue_result():
|
|||||||
button_stop.config(state=tk.DISABLED)
|
button_stop.config(state=tk.DISABLED)
|
||||||
button_open2.config(state=tk.NORMAL)
|
button_open2.config(state=tk.NORMAL)
|
||||||
button_open3.config(state=tk.NORMAL)
|
button_open3.config(state=tk.NORMAL)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
check_repair.config(state=tk.NORMAL)
|
||||||
label_status.config(text= "Canceled queue")
|
label_status.config(text= "Canceled queue")
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -194,6 +212,8 @@ def queue_result():
|
|||||||
button_stop.config(state=tk.DISABLED)
|
button_stop.config(state=tk.DISABLED)
|
||||||
button_open2.config(state=tk.NORMAL)
|
button_open2.config(state=tk.NORMAL)
|
||||||
button_open3.config(state=tk.NORMAL)
|
button_open3.config(state=tk.NORMAL)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
check_repair.config(state=tk.NORMAL)
|
||||||
label_status.config(text= "Verified all PAR sets")
|
label_status.config(text= "Verified all PAR sets")
|
||||||
|
|
||||||
elif "disabled" in button_stop.state():
|
elif "disabled" in button_stop.state():
|
||||||
@@ -201,8 +221,10 @@ def queue_result():
|
|||||||
button_start.config(state=tk.NORMAL)
|
button_start.config(state=tk.NORMAL)
|
||||||
button_open2.config(state=tk.NORMAL)
|
button_open2.config(state=tk.NORMAL)
|
||||||
button_open3.config(state=tk.NORMAL)
|
button_open3.config(state=tk.NORMAL)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
check_repair.config(state=tk.NORMAL)
|
||||||
label_status.config(text= "Interrupted queue")
|
label_status.config(text= "Interrupted queue")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
root.after(100, queue_run)
|
root.after(100, queue_run)
|
||||||
|
|
||||||
@@ -216,6 +238,8 @@ def button_start_clicked():
|
|||||||
button_stop.config(state=tk.NORMAL)
|
button_stop.config(state=tk.NORMAL)
|
||||||
button_open2.config(state=tk.DISABLED)
|
button_open2.config(state=tk.DISABLED)
|
||||||
button_open3.config(state=tk.DISABLED)
|
button_open3.config(state=tk.DISABLED)
|
||||||
|
combo_recursive.config(state=tk.DISABLED)
|
||||||
|
check_repair.config(state=tk.DISABLED)
|
||||||
|
|
||||||
if sub_proc == None:
|
if sub_proc == None:
|
||||||
queue_run()
|
queue_run()
|
||||||
@@ -225,8 +249,19 @@ def button_start_clicked():
|
|||||||
|
|
||||||
# Stop running queue
|
# Stop running queue
|
||||||
def button_stop_clicked():
|
def button_stop_clicked():
|
||||||
|
global sub_proc
|
||||||
|
|
||||||
button_stop.config(state=tk.DISABLED)
|
button_stop.config(state=tk.DISABLED)
|
||||||
if sub_proc != None:
|
if sub_proc is None:
|
||||||
|
# When verification was not started yet, it's possible to select another folder.
|
||||||
|
button_folder.config(state=tk.NORMAL)
|
||||||
|
button_start.config(state=tk.DISABLED)
|
||||||
|
combo_recursive.config(state=tk.NORMAL)
|
||||||
|
listbox_list1.delete(0, tk.END)
|
||||||
|
label_head1.config(text='? sets in a folder')
|
||||||
|
label_status.config(text='Select a folder to search PAR files.')
|
||||||
|
else:
|
||||||
|
# When it's verifying, it will stop next verification.
|
||||||
label_status.config(text= "Waiting finish of current task")
|
label_status.config(text= "Waiting finish of current task")
|
||||||
|
|
||||||
|
|
||||||
@@ -293,7 +328,7 @@ frame_middle.columnconfigure(2, weight=1)
|
|||||||
frame_list1 = ttk.Frame(frame_middle, padding=(6,2,6,6), relief='groove')
|
frame_list1 = ttk.Frame(frame_middle, padding=(6,2,6,6), relief='groove')
|
||||||
frame_list1.grid(row=0, column=0, padx=4, sticky=(tk.E,tk.W,tk.S,tk.N))
|
frame_list1.grid(row=0, column=0, padx=4, sticky=(tk.E,tk.W,tk.S,tk.N))
|
||||||
frame_list1.columnconfigure(0, weight=1)
|
frame_list1.columnconfigure(0, weight=1)
|
||||||
frame_list1.rowconfigure(2, weight=1)
|
frame_list1.rowconfigure(3, weight=1)
|
||||||
|
|
||||||
frame_top1 = ttk.Frame(frame_list1, padding=(0,4,0,3))
|
frame_top1 = ttk.Frame(frame_list1, padding=(0,4,0,3))
|
||||||
frame_top1.grid(row=0, column=0, columnspan=2, sticky=(tk.E,tk.W))
|
frame_top1.grid(row=0, column=0, columnspan=2, sticky=(tk.E,tk.W))
|
||||||
@@ -307,19 +342,31 @@ button_start.pack(side=tk.LEFT, padx=2)
|
|||||||
button_stop = ttk.Button(frame_top1, text="Stop", width=6, command=button_stop_clicked, state=tk.DISABLED)
|
button_stop = ttk.Button(frame_top1, text="Stop", width=6, command=button_stop_clicked, state=tk.DISABLED)
|
||||||
button_stop.pack(side=tk.LEFT, padx=2)
|
button_stop.pack(side=tk.LEFT, padx=2)
|
||||||
|
|
||||||
|
frame_top11 = ttk.Frame(frame_list1, padding=(0,3,0,3))
|
||||||
|
frame_top11.grid(row=1, column=0, columnspan=2, sticky=(tk.E,tk.W))
|
||||||
|
|
||||||
|
s_combo = tk.StringVar()
|
||||||
|
combo_recursive = ttk.Combobox(frame_top11, values=["No child", "Children", "Recursive"], textvariable=s_combo, state="readonly", width=9)
|
||||||
|
combo_recursive.current(0)
|
||||||
|
combo_recursive.pack(side=tk.LEFT, padx=4)
|
||||||
|
|
||||||
|
i_check = tk.IntVar(value=0)
|
||||||
|
check_repair = ttk.Checkbutton(frame_top11, text="Repair", variable=i_check)
|
||||||
|
check_repair.pack(side=tk.LEFT, padx=10)
|
||||||
|
|
||||||
label_head1 = ttk.Label(frame_list1, text='? sets in a folder')
|
label_head1 = ttk.Label(frame_list1, text='? sets in a folder')
|
||||||
label_head1.grid(row=1, column=0, columnspan=2)
|
label_head1.grid(row=2, column=0, columnspan=2)
|
||||||
|
|
||||||
s_list1 = tk.StringVar()
|
s_list1 = tk.StringVar()
|
||||||
listbox_list1 = tk.Listbox(frame_list1, listvariable=s_list1, activestyle='none')
|
listbox_list1 = tk.Listbox(frame_list1, listvariable=s_list1, activestyle='none')
|
||||||
listbox_list1.grid(row=2, column=0, sticky=(tk.E,tk.W,tk.S,tk.N))
|
listbox_list1.grid(row=3, column=0, sticky=(tk.E,tk.W,tk.S,tk.N))
|
||||||
|
|
||||||
scrollbar_list1 = ttk.Scrollbar(frame_list1, orient=tk.VERTICAL, command=listbox_list1.yview)
|
scrollbar_list1 = ttk.Scrollbar(frame_list1, orient=tk.VERTICAL, command=listbox_list1.yview)
|
||||||
scrollbar_list1.grid(row=2, column=1, sticky=(tk.N, tk.S))
|
scrollbar_list1.grid(row=3, column=1, sticky=(tk.N, tk.S))
|
||||||
listbox_list1["yscrollcommand"] = scrollbar_list1.set
|
listbox_list1["yscrollcommand"] = scrollbar_list1.set
|
||||||
|
|
||||||
xscrollbar_list1 = ttk.Scrollbar(frame_list1, orient=tk.HORIZONTAL, command=listbox_list1.xview)
|
xscrollbar_list1 = ttk.Scrollbar(frame_list1, orient=tk.HORIZONTAL, command=listbox_list1.xview)
|
||||||
xscrollbar_list1.grid(row=3, column=0, sticky=(tk.E, tk.W))
|
xscrollbar_list1.grid(row=4, column=0, sticky=(tk.E, tk.W))
|
||||||
listbox_list1["xscrollcommand"] = xscrollbar_list1.set
|
listbox_list1["xscrollcommand"] = xscrollbar_list1.set
|
||||||
|
|
||||||
# List of bad files
|
# List of bad files
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
alpha/ui/0412.dll
Normal file
BIN
alpha/ui/0412.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
62
source/ResourceUI/0412/0412.vcxproj
Normal file
62
source/ResourceUI/0412/0412.vcxproj
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<VCProjectVersion>17.0</VCProjectVersion>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<ProjectGuid>{e8d64ddc-9687-4d16-b2a6-224cab82f8b3}</ProjectGuid>
|
||||||
|
<RootNamespace>My0412</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<GenerateManifest>false</GenerateManifest>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;MY0412_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<NoEntryPoint>true</NoEntryPoint>
|
||||||
|
<SetChecksum>true</SetChecksum>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="resource.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ResourceCompile Include="Res0412.rc" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
BIN
source/ResourceUI/0412/Res0412.rc
Normal file
BIN
source/ResourceUI/0412/Res0412.rc
Normal file
Binary file not shown.
BIN
source/ResourceUI/0412/resource.h
Normal file
BIN
source/ResourceUI/0412/resource.h
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -23,52 +23,101 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3009", "3009\3009.vcxproj",
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "0c0a", "0c0a\0c0a.vcxproj", "{7BC2D258-305F-4BAE-8249-66A4711CB761}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "0c0a", "0c0a\0c0a.vcxproj", "{7BC2D258-305F-4BAE-8249-66A4711CB761}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "0412", "0412\0412.vcxproj", "{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
Release|Win32 = Release|Win32
|
Release|Win32 = Release|Win32
|
||||||
|
Release|x64 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|Win32.ActiveCfg = Release|Win32
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|Win32.Build.0 = Release|Win32
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Debug|x64.Build.0 = Release|Win32
|
||||||
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|Win32.ActiveCfg = Release|Win32
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|Win32.Build.0 = Release|Win32
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{058F9846-C6FE-4BA6-A8B3-F941711876E5}.Release|x64.Build.0 = Release|Win32
|
||||||
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|Win32.ActiveCfg = Release|Win32
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|Win32.Build.0 = Release|Win32
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Debug|x64.Build.0 = Release|Win32
|
||||||
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|Win32.ActiveCfg = Release|Win32
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|Win32.Build.0 = Release|Win32
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{A6B4CE94-B0F5-46C2-8D65-2ACBA4444B80}.Release|x64.Build.0 = Release|Win32
|
||||||
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|Win32.ActiveCfg = Release|Win32
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|Win32.Build.0 = Release|Win32
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Debug|x64.Build.0 = Release|Win32
|
||||||
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|Win32.ActiveCfg = Release|Win32
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|Win32.Build.0 = Release|Win32
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{8BE95D56-2B92-40CD-A8D9-506BA9AFD213}.Release|x64.Build.0 = Release|Win32
|
||||||
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|Win32.ActiveCfg = Release|Win32
|
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|Win32.Build.0 = Release|Win32
|
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{386E588F-363C-4763-830F-4738F947B5D9}.Debug|x64.Build.0 = Release|Win32
|
||||||
{386E588F-363C-4763-830F-4738F947B5D9}.Release|Win32.ActiveCfg = Release|Win32
|
{386E588F-363C-4763-830F-4738F947B5D9}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{386E588F-363C-4763-830F-4738F947B5D9}.Release|Win32.Build.0 = Release|Win32
|
{386E588F-363C-4763-830F-4738F947B5D9}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{386E588F-363C-4763-830F-4738F947B5D9}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{386E588F-363C-4763-830F-4738F947B5D9}.Release|x64.Build.0 = Release|Win32
|
||||||
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|Win32.ActiveCfg = Release|Win32
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|Win32.Build.0 = Release|Win32
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Debug|x64.Build.0 = Release|Win32
|
||||||
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|Win32.ActiveCfg = Release|Win32
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|Win32.Build.0 = Release|Win32
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{9BFFB67E-6EAB-452B-AB40-10C13A894895}.Release|x64.Build.0 = Release|Win32
|
||||||
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|Win32.ActiveCfg = Release|Win32
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|Win32.Build.0 = Release|Win32
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Debug|x64.Build.0 = Release|Win32
|
||||||
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|Win32.ActiveCfg = Release|Win32
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|Win32.Build.0 = Release|Win32
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{41E89B6A-B137-4756-8C7A-E4A4309627DB}.Release|x64.Build.0 = Release|Win32
|
||||||
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|Win32.ActiveCfg = Release|Win32
|
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|Win32.Build.0 = Release|Win32
|
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{F5774034-4459-41E4-A34C-5694159088C7}.Debug|x64.Build.0 = Release|Win32
|
||||||
{F5774034-4459-41E4-A34C-5694159088C7}.Release|Win32.ActiveCfg = Release|Win32
|
{F5774034-4459-41E4-A34C-5694159088C7}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{F5774034-4459-41E4-A34C-5694159088C7}.Release|Win32.Build.0 = Release|Win32
|
{F5774034-4459-41E4-A34C-5694159088C7}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{F5774034-4459-41E4-A34C-5694159088C7}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{F5774034-4459-41E4-A34C-5694159088C7}.Release|x64.Build.0 = Release|Win32
|
||||||
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|Win32.ActiveCfg = Release|Win32
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|Win32.Build.0 = Release|Win32
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Debug|x64.Build.0 = Release|Win32
|
||||||
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|Win32.ActiveCfg = Release|Win32
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|Win32.Build.0 = Release|Win32
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{25EB68DE-0594-4D2F-B31F-50375524D04A}.Release|x64.Build.0 = Release|Win32
|
||||||
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|Win32.ActiveCfg = Release|Win32
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|Win32.Build.0 = Release|Win32
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Debug|x64.Build.0 = Release|Win32
|
||||||
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|Win32.ActiveCfg = Release|Win32
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|Win32.Build.0 = Release|Win32
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{B316EAF0-4D5E-446C-8520-D720ECD1F3AC}.Release|x64.Build.0 = Release|Win32
|
||||||
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|Win32.ActiveCfg = Release|Win32
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|Win32.Build.0 = Release|Win32
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|Win32.Build.0 = Release|Win32
|
||||||
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Debug|x64.Build.0 = Release|Win32
|
||||||
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|Win32.ActiveCfg = Release|Win32
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|Win32.Build.0 = Release|Win32
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|x64.ActiveCfg = Release|Win32
|
||||||
|
{7BC2D258-305F-4BAE-8249-66A4711CB761}.Release|x64.Build.0 = Release|Win32
|
||||||
|
{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}.Debug|Win32.ActiveCfg = Release|Win32
|
||||||
|
{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}.Debug|x64.ActiveCfg = Release|Win32
|
||||||
|
{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{E8D64DDC-9687-4D16-B2A6-224CAB82F8B3}.Release|x64.ActiveCfg = Release|Win32
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ append something to the section name like "[0x0409ignore]".
|
|||||||
If you erase these strings or lines, default strings are used.
|
If you erase these strings or lines, default strings are used.
|
||||||
|
|
||||||
"CreateHelp" and "VerifyHelp" in old version were removed,
|
"CreateHelp" and "VerifyHelp" in old version were removed,
|
||||||
because they are ignored on recent Windows OS like (Vista, 7, 8).
|
because they are ignored on recent Windows OS like (Windows 7, 8, 10).
|
||||||
|
|
||||||
Strings may contain one "&" for keyboard short-cut.
|
Strings may contain one "&" for keyboard short-cut.
|
||||||
Each strings should be reasonably short (under 40 characters).
|
Each strings should be reasonably short (under 40 characters).
|
||||||
|
|||||||
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
// Copyright : 2023-03-24 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : The MIT license
|
// License : The MIT license
|
||||||
|
|
||||||
// ShellExt.cpp : DLL アプリケーション用のエントリ ポイントを定義します。
|
// ShellExt.cpp : DLL アプリケーション用のエントリ ポイントを定義します。
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
Binary file not shown.
@@ -103,6 +103,16 @@ It means that it is impossible to mix "/" and "-" in options of same command lin
|
|||||||
If PAR file's filename (or relative path) is started by "-",
|
If PAR file's filename (or relative path) is started by "-",
|
||||||
you need to use "/" for prefix of options to distinguish PAR file.
|
you need to use "/" for prefix of options to distinguish PAR file.
|
||||||
|
|
||||||
|
When a option has arbitary number or text,
|
||||||
|
don't put space between the option and following part.
|
||||||
|
For example, setting "/rr1" is valid, but "/rr 1" is wrong.
|
||||||
|
Setting "/dPath" is valid, but "/d Path" is wrong.
|
||||||
|
|
||||||
|
To distinguish options from filenames, order of command-line arguments is important.
|
||||||
|
Put all options before <par file>.
|
||||||
|
Put <par file> before all [input files].
|
||||||
|
|
||||||
|
|
||||||
/f, /fu :
|
/f, /fu :
|
||||||
Set this, if you use file-list for file name or file path.
|
Set this, if you use file-list for file name or file path.
|
||||||
The file-list is a text file, which contains filenames in each line.
|
The file-list is a text file, which contains filenames in each line.
|
||||||
@@ -169,8 +179,10 @@ If you include space in comment, use "" to specify where is end.
|
|||||||
use this setting to set the path as base-directory.
|
use this setting to set the path as base-directory.
|
||||||
This is either absolute path or relative path from current directory.
|
This is either absolute path or relative path from current directory.
|
||||||
If you include space in path, use "" to specify where is end.
|
If you include space in path, use "" to specify where is end.
|
||||||
Note, setting "/dC:" is same as setting current directory of C-drive.
|
As you may omit the last "/" in path of a folder,
|
||||||
If you want to set direct root of C-drive, you must set "/dC:/".
|
both "/dC:/data/" and "/dC:/data" are valid.
|
||||||
|
Note, setting "/dD:" is same as setting current directory of D-drive.
|
||||||
|
If you want to set direct root of D-drive, you must set "/dD:/".
|
||||||
|
|
||||||
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Parchive 1.0 client by Yutaka Sawada
|
|||||||
You cannot specify Non-Recovery-Set files. (Empty files are set.)
|
You cannot specify Non-Recovery-Set files. (Empty files are set.)
|
||||||
Number of recovery files are limited to 99.
|
Number of recovery files are limited to 99.
|
||||||
|
|
||||||
This requires a PC of Windows Vista or later (Windows 7, 8, 10, 11).
|
This requires a PC of Windows 7 or later (Windows 8, 10, 11).
|
||||||
This is developed with Visual Studio 2022 on Windows 10.
|
This is developed with Visual Studio 2022 on Windows 10.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ WinRAR
|
|||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>ƃp<C683><70><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>̍<EFBFBD><CC8D>v<EFBFBD><76> 256<35>܂łł<C582><C582>B
|
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>ƃp<C683><70><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>̍<EFBFBD><CC8D>v<EFBFBD><76> 256<35>܂łł<C582><C582>B
|
||||||
<EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>͍ő<CD8D><C591><EFBFBD> 99<39>܂łł<C582><C582>B
|
<EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>͍ő<CD8D><C591><EFBFBD> 99<39>܂łł<C582><C582>B
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C28B><EFBFBD> Windows Vista <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~ (Windows 7, 8, 10, 11) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>\<5C>R<EFBFBD><52><EFBFBD>ł<EFBFBD><C582>B
|
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C28B><EFBFBD> Windows 7 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~ (Windows 8, 10, 11) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>\<5C>R<EFBFBD><52><EFBFBD>ł<EFBFBD><C582>B
|
||||||
Win32 API <20><> VC <20><><EFBFBD><EFBFBD><EFBFBD>^<5E>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482>̂ŁA
|
Win32 API <20><> VC <20><><EFBFBD><EFBFBD><EFBFBD>^<5E>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482>̂ŁA
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> Visual Studio 2022 <20>ȍ~<7E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD><C582>B
|
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> Visual Studio 2022 <20>ȍ~<7E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD><C582>B
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// common.c
|
// common.c
|
||||||
// Copyright : 2023-03-13 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// ini.c
|
// ini.c
|
||||||
// Copyright : 2022-01-15 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// par1.c
|
// par1.c
|
||||||
// Copyright : 2022-02-16 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// par1_cmd.c
|
// par1_cmd.c
|
||||||
// Copyright : 2023-03-14 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
Binary file not shown.
@@ -1,2 +1,2 @@
|
|||||||
#define FILE_VERSION "1.3.2.8" // ファイルのバージョン番号
|
#define FILE_VERSION "1.3.3.5" // ファイルのバージョン番号
|
||||||
#define PRODUCT_VERSION 0x132 // クライアントのバージョン番号
|
#define PRODUCT_VERSION 0x133 // クライアントのバージョン番号
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[ par2j.exe - version 1.3.3.0 or later ]
|
[ par2j.exe - version 1.3.3.5 or later ]
|
||||||
|
|
||||||
Type "par2j.exe" to see version, test integrity, and show usage below.
|
Type "par2j.exe" to see version, test integrity, and show usage below.
|
||||||
|
|
||||||
@@ -148,6 +148,16 @@ It means that it is impossible to mix "/" and "-" in options of same command lin
|
|||||||
If PAR file's filename (or relative path) is started by "-",
|
If PAR file's filename (or relative path) is started by "-",
|
||||||
you need to use "/" for prefix of options to distinguish PAR file.
|
you need to use "/" for prefix of options to distinguish PAR file.
|
||||||
|
|
||||||
|
When a option has arbitary number or text,
|
||||||
|
don't put space between the option and following part.
|
||||||
|
For example, setting "/rr10" is valid, but "/rr 10" is wrong.
|
||||||
|
Setting "/dPath" is valid, but "/d Path" is wrong.
|
||||||
|
|
||||||
|
To distinguish options from filenames, order of command-line arguments is important.
|
||||||
|
Put all options before <par file>.
|
||||||
|
Put <par file> before all [input files] or [external files].
|
||||||
|
|
||||||
|
|
||||||
/f, /fu :
|
/f, /fu :
|
||||||
Set this, if you use file-list for file name or file path.
|
Set this, if you use file-list for file name or file path.
|
||||||
When this option is set, [input files] or [external files] is path of file-list.
|
When this option is set, [input files] or [external files] is path of file-list.
|
||||||
@@ -302,7 +312,7 @@ Because it may be difficult to predict recovery file size,
|
|||||||
use trial command to see how is the size.
|
use trial command to see how is the size.
|
||||||
When it's "/lr" or "/lr0", block count of the largest input file is used.
|
When it's "/lr" or "/lr0", block count of the largest input file is used.
|
||||||
(If the max file is 1000 KB and block size is 10 KB, /lr is same as /lr100.)
|
(If the max file is 1000 KB and block size is 10 KB, /lr is same as /lr100.)
|
||||||
When split size "/ls" is set with "/lr0",
|
When both "/lr0" and "/ls(split size)" are set,
|
||||||
block count of the splited file size is used instead of the largest input file.
|
block count of the splited file size is used instead of the largest input file.
|
||||||
|
|
||||||
for example, /lr , /lr10 , /lr2000
|
for example, /lr , /lr10 , /lr2000
|
||||||
@@ -354,6 +364,13 @@ This is possible, only when there is one input file of .ZIP or .7z format.
|
|||||||
When recovery files are created in a different directory,
|
When recovery files are created in a different directory,
|
||||||
the protected archive file is made in the directory.
|
the protected archive file is made in the directory.
|
||||||
|
|
||||||
|
/ls2 has a special feature to set limit size of recovery files directly.
|
||||||
|
When both "/ls2" and "/lr(limit size)" are set,
|
||||||
|
setting number of /lr is recognizned as file size instead of number of blocks.
|
||||||
|
In this usage, setting limit size must be less than 2 GB.
|
||||||
|
If you want max 100 MB each file size, set like these; /ls2 /lr102400000
|
||||||
|
Because the calculation ignores packets, you may set a bit smaller size.
|
||||||
|
|
||||||
for example, /ls10000 , /ls1048576, /ls1
|
for example, /ls10000 , /ls1048576, /ls1
|
||||||
|
|
||||||
/lc :
|
/lc :
|
||||||
@@ -367,16 +384,43 @@ The format is "/lc#" (# is from 1 to 32 as the number of using threads).
|
|||||||
253: It uses 3/4 number of physical Cores.
|
253: It uses 3/4 number of physical Cores.
|
||||||
254: It uses one less threads than number of physical Cores.
|
254: It uses one less threads than number of physical Cores.
|
||||||
0: It uses the number of physical Cores.
|
0: It uses the number of physical Cores.
|
||||||
255: It uses one more threads than number of physical Cores.
|
255: It tries to use more threads than number of physical Cores.
|
||||||
|
|
||||||
You may set additional combinations;
|
You may set additional combinations for CPU feature;
|
||||||
+1024 to disable CLMUL (and use old SSSE3 code),
|
+1024 to disable CLMUL (and use slower SSSE3 code)
|
||||||
+2048 to disable JIT (for SSE2),
|
+2048 to disable JIT (for SSE2)
|
||||||
+4096 to disable SSSE3,
|
+4096 to disable SSSE3
|
||||||
+8192 to disable AVX2,
|
+8192 to disable AVX2
|
||||||
+256 or +512 (slower device) to enable GPU acceleration.
|
|
||||||
|
|
||||||
for example, /lc1 to use single Core, /lc45 to use half Cores and GPU
|
You may set additional combinations for GPU control;
|
||||||
|
+256 or +512 (slower device) to enable GPU acceleration
|
||||||
|
+65536 for classic method
|
||||||
|
+131072 for 16-byte memory access
|
||||||
|
+262144 for 4-byte memory access and calculate 2 blocks at once
|
||||||
|
+524288 for 16-byte memory access and calculate 2 blocks at once
|
||||||
|
+1048576 for CL_MEM_COPY_HOST_PTR or +2097152 for CL_MEM_USE_HOST_PTR
|
||||||
|
(When you set exclusive bits, larger value will be used.)
|
||||||
|
|
||||||
|
for example, /lc1 to use single Core, /lc508 to use half Cores and GPU
|
||||||
|
|
||||||
|
/lcb :
|
||||||
|
This is for Cache Blocking. (CPU cache optimization)
|
||||||
|
By default, this value is set-associative size of CPU L2 cache.
|
||||||
|
Maximum value is 32767. It will be multipled by 64 KB.
|
||||||
|
To disable cache optimization, set "/lcb0".
|
||||||
|
|
||||||
|
/lcs :
|
||||||
|
This is for large buffer size at calculating multiple files' hashes.
|
||||||
|
By default, this value is set-associative size of CPU L3 cache.
|
||||||
|
Maximum value is 65535. It will be multipled by 64 KB.
|
||||||
|
When you set "/lcs0", large buffer size will become 2 MB by default.
|
||||||
|
|
||||||
|
/lcm :
|
||||||
|
This is for max number of chunks to calculate at once. (CPU shared cache optimization)
|
||||||
|
By default, this value may be rate of L3 cache size / L2 cache size.
|
||||||
|
The value may be changed by some factors in experimental results.
|
||||||
|
Maximum value is 32768. Lower values than 8 will be same as 32768.
|
||||||
|
To disable cache optimization, set "/lcm0".
|
||||||
|
|
||||||
/m :
|
/m :
|
||||||
Set this, if you want to set memory usage.
|
Set this, if you want to set memory usage.
|
||||||
@@ -447,8 +491,10 @@ If you include space in comment, use "" to specify where is end.
|
|||||||
use this setting to set the path as base-directory.
|
use this setting to set the path as base-directory.
|
||||||
This is either absolute path or relative path from current directory.
|
This is either absolute path or relative path from current directory.
|
||||||
If you include space in path, use "" to specify where is end.
|
If you include space in path, use "" to specify where is end.
|
||||||
Note, setting "/dC:" is same as setting current directory of C-drive.
|
As you may omit the last "/" in path of a folder,
|
||||||
If you want to set direct root of C-drive, you must set "/dC:/".
|
both "/dC:/data/" and "/dC:/data" are valid.
|
||||||
|
Note, setting "/dD:" is same as setting current directory of D-drive.
|
||||||
|
If you want to set direct root of D-drive, you must set "/dD:/".
|
||||||
|
|
||||||
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
for example, /dC:/data/ , /d"C:/Program Files/" , /d../data/
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ Parchive 2.0 client by Yutaka Sawada
|
|||||||
Verifying file use same memory as the file or double of block size.
|
Verifying file use same memory as the file or double of block size.
|
||||||
Recovering block use more memory as the number of block is many.
|
Recovering block use more memory as the number of block is many.
|
||||||
|
|
||||||
This requires a PC of Windows Vista or later (Windows 7, 8, 10, 11).
|
This requires a PC of Windows 7 or later (Windows 8, 10, 11).
|
||||||
This is developed with Visual Studio 2022 on Windows 10.
|
This is developed with Visual Studio 2022 on Windows 10.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,140 +1,140 @@
|
|||||||
|
|
||||||
|
PAR 2.0 の修復用データを作ってファイルの破損や消失に備えます
|
||||||
|
|
||||||
PAR 2.0 <20>̏C<CC8F><43><EFBFBD>p<EFBFBD>f<EFBFBD>[<5B>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ăt<C483>@<40>C<EFBFBD><43><EFBFBD>̔j<CC94><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɔ<EFBFBD><C994><EFBFBD><EFBFBD>܂<EFBFBD>
|
澤田 豊 による Parchive 2.0 クライアント
|
||||||
|
|
||||||
<EFBFBD>V<EFBFBD>c <20>L <20>ɂ<EFBFBD><C982><EFBFBD> Parchive 2.0 <20>N<EFBFBD><4E><EFBFBD>C<EFBFBD>A<EFBFBD><41><EFBFBD>g
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ <EFBFBD>ȒP<EFBFBD>ȉ<EFBFBD><EFBFBD><EFBFBD> ]
|
[ 簡単な解説 ]
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD>̃\<5C>[<5B>X<EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>烊<EFBFBD>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>쐬<EFBFBD><EC90AC><EFBFBD>āA
|
複数のソース・ファイルからリカバリ・ファイルを作成して、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̈ꕔ<CC88><EA9594><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>A
|
それらのファイルの一部が破損したり消失しても、
|
||||||
<EFBFBD>c<EFBFBD><EFBFBD><EFBFBD>ꂽ<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ƃ<EFBFBD><C683>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A
|
残されたソース・ファイルとリカバリ・ファイルから、
|
||||||
<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ׂ̃\<5C>t<EFBFBD>g<EFBFBD>ł<EFBFBD><C582>B
|
ファイルを修復する為のソフトです。
|
||||||
PAR 1.0 <EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>P<EFBFBD>ʂŏC<C58F><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ɔ<CC82><C994>ׂāA
|
PAR 1.0 がファイル単位で修復するのに比べて、
|
||||||
PAR 2.0 <EFBFBD>̓t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><F095A190>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>ɕ<EFBFBD><C995><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD>P<EFBFBD>ʂŏC<C58F><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁA
|
PAR 2.0 はファイルを複数ブロックに分割してそのブロック単位で修復するので、
|
||||||
<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̈ꕔ<CC88><EA9594><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȊO<C88A>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD>͖<EFBFBD><CD96><EFBFBD><EFBFBD>Ŏ<EFBFBD><C58E><EFBFBD><EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
ファイルの一部が破損しても破損部分以外のブロックは無傷で取り出すことができます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̂<EFBFBD><EFBFBD>߁A<EFBFBD><EFBFBD><EFBFBD>蕡<EFBFBD>G<EFBFBD>ȃG<EFBFBD><EFBFBD><EFBFBD>[<5B>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>璷<EFBFBD><E792B7><EFBFBD>őΏ<C591><CE8F><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
そのため、より複雑なエラーにも少ない冗長性で対処することができます。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>X<C281>ɓƗ<C993><C697><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>P<EFBFBD>b<EFBFBD>g<EFBFBD>ō\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD>Ȃ̂ŁA
|
リカバリ・ファイルも個々に独立したパケットで構成される構造なので、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>Ȕj<EFBFBD><EFBFBD><EFBFBD>ɋ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>āA<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD><EFBFBD><EFBFBD>Ɏg<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
部分的な破損に強くて、より有効に使うことができます。
|
||||||
<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>قNjǒn<EFBFBD>I<EFBFBD>ȃG<EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ɉe<C989><65><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>A
|
ブロック・サイズが小さいほど局地的なエラーが他に影響しにくくなり、
|
||||||
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>ɕK<EFBFBD>v<EFBFBD>ȃ<EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>čς݂܂<DD82><DC82>B
|
修復に必要なリカバリ・ファイルも少なくて済みます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꂽ<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><F0959C8C><EFBFBD><EFBFBD>邽<EFBFBD>߂ɂ<DF82>
|
しかし、失われたソース・ブロックを復元するためには
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD>ɂȂ<EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD><EFBFBD> PAR <20>̊<EFBFBD><CC8A>{<7B><><EFBFBD><EFBFBD><EFBFBD>͓<EFBFBD><CD93><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
同数のパリティ・ブロックが必要になるという PAR の基本原理は同じです。
|
||||||
<EFBFBD>쐬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>̐<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʂŁA
|
作成するパリティ・ブロックの数が復元できる量で、
|
||||||
<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD>͂<EFBFBD><EFBFBD>̕<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>ʂɂȂ<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
ブロック・サイズはその復元する単位になります。
|
||||||
|
|
||||||
<EFBFBD>@PAR 2.0 <EFBFBD>̓t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>Ƀf<C983>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>܂ނ<DC82><DE82>Ƃ<EFBFBD><C682>ł<EFBFBD><C582><EFBFBD><EFBFBD>̂ŁA
|
PAR 2.0 はファイル名にディレクトリも含むことができるので、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>H<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>ɎU<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂܂C<DC8F><43><EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƁA
|
複数のフォルダに散らばったファイルをそのまま修復することができたりと、
|
||||||
PAR 1.0 <EFBFBD>ɔ<EFBFBD><EFBFBD>ׂĂ<EFBFBD><EFBFBD>葽<EFBFBD><EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD>ɏC<C98F><43><EFBFBD>ł<EFBFBD><C582>Ďg<C48E><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͂悭<CD82>Ȃ<EFBFBD><C882>Ă܂<C482><DC82>B
|
PAR 1.0 に比べてより多くのファイルを柔軟に修復できて使い勝手はよくなってます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̔<EFBFBD><EFBFBD>ʁA<EFBFBD>傫<EFBFBD>ȃt<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>⑽<EFBFBD><E291BD><EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƁA
|
その反面、大きなファイルや多数のブロックを処理すると、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EF82AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>Z<EFBFBD>ɂ₽<C982><E282BD><EFBFBD>Ǝ<EFBFBD><C68E>Ԃ<EFBFBD><D482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
メモリー消費が増えたり計算にやたらと時間がかかります。
|
||||||
<EFBFBD>@<40>\<5C>I<EFBFBD>ɂ<EFBFBD> PAR 2.0 <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʔłł<C582><C582><EFBFBD><EFBFBD>A<EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G<EFBFBD>őΉ<C591><CE89>\<5C>t<EFBFBD>g<EFBFBD><67><EFBFBD>قƂ<D982><C682>ǂȂ<C782><C882>A
|
機能的には PAR 2.0 の方が上位版ですが、構造が複雑で対応ソフトがほとんどなく、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C>ȃp<C883>\<5C>R<EFBFBD><52><EFBFBD>łȂ<C582><C882>Ǝ<EFBFBD><C68E>p<EFBFBD>I<EFBFBD>ȏ<EFBFBD><C88F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD><EFBFBD><F093BE82><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
高性能なパソコンでないと実用的な処理速度を得られないかもしれません。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>ɔ<EFBFBD><EFBFBD>͂ȃp<EFBFBD>\<5C>R<EFBFBD><52><EFBFBD>ł̓V<CD83><56><EFBFBD>v<EFBFBD><76><EFBFBD>Ōy<C58C><79><EFBFBD><EFBFBD> PAR 1.0 <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă邱<C482>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁA
|
特に非力なパソコンではシンプルで軽快な PAR 1.0 の方が向いてることもあるので、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>r<EFBFBD>ɉ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ďg<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
環境や用途に応じて使い分けてください。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>d<EFBFBD>l<EFBFBD>Ȃ<EFBFBD> ]
|
[ 特徴や仕様など ]
|
||||||
|
|
||||||
<EFBFBD>@Parity Archive 2.0 <EFBFBD>̖{<7B><> par2cmdline <EFBFBD><EFBFBD> QuickPar <EFBFBD>ɔ<EFBFBD><EFBFBD>ׂāA
|
Parity Archive 2.0 の本家 par2cmdline や QuickPar に比べて、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ɃR<C983><52><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>t<EFBFBD><74><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
リカバリ・ファイルにコメントを付けることができます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>ǂݏ<C782><DD8F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂Ń}<7D><><EFBFBD>`<60>o<EFBFBD>C<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982>Ή<EFBFBD><CE89><EFBFBD><EFBFBD>Ă܂<C482><DC82>B
|
ユニコードを読み書きするのでマルチバイト文字にも対応してます。
|
||||||
<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><EFBFBD> 0<>̋<EFBFBD><CC8B>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ɂ<EFBFBD><C982>Ή<EFBFBD><CE89><EFBFBD><EFBFBD>Ă܂<C482><DC82>B
|
サイズが 0の空ファイルにも対応してます。
|
||||||
par2cmdline <EFBFBD>̓T<EFBFBD>u<EFBFBD>E<EFBFBD>f<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ĔF<C494><46><EFBFBD><EFBFBD><EFBFBD>A
|
par2cmdline はサブ・ディレクトリをファイル名として認識し、
|
||||||
QuickPar <EFBFBD>͖<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>̃A<EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
QuickPar は無視しますが、このアプリケーションは
|
||||||
<EFBFBD>t<EFBFBD>H<EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><EFBFBD><EFBFBD>T<EFBFBD>u<EFBFBD>E<EFBFBD>f<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>Ȃǂ̃f<EFBFBD>B<EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><F0959C8C><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
フォルダやサブ・ディレクトリなどのディレクトリ構造を復元することができます。
|
||||||
|
|
||||||
<EFBFBD>@QuickPar <EFBFBD>͖<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɃS<EFBFBD>~<7E><><EFBFBD>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԂŔ<D482><C594>[<5B>ȃu<C883><75><EFBFBD>b<EFBFBD>N<EFBFBD>̒<EFBFBD><CC92>O<EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
QuickPar は末尾にゴミが付いた状態で半端なブロックの直前のブロックが破損すると
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̃u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>F<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>̃A<EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>ł͂<C582><CD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɣ<EFBFBD><C694>肵<EFBFBD>܂<EFBFBD><DC82>B
|
そのブロックを認識できなくなりますが、このアプリケーションではきちんと判定します。
|
||||||
<EFBFBD>܂<EFBFBD><EFBFBD>A<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ē<EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>œ<EFBFBD><C593>e<EFBFBD><65><EFBFBD>d<EFBFBD><64><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>ƁA
|
また、ブロック・サイズが小さくて同一ファイル内で内容が重複してると、
|
||||||
<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>ȍ~<7E>Ɍ<EFBFBD><C98C>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>Ɍ<EFBFBD><C98C>o<EFBFBD><6F><EFBFBD>錻<EFBFBD>ۂ<EFBFBD><DB82>N<EFBFBD><4E><EFBFBD>āA
|
破損ブロック以降に後のブロックを先に検出する現象が起きて、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̌<EFBFBD><EFBFBD>Ŗ{<7B><><EFBFBD>̏<EFBFBD><CC8F>Ԃ̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>F<EFBFBD><46><EFBFBD>ł<EFBFBD><C582>Ȃ<EFBFBD><C882>Ȃ<EFBFBD><C882>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD><EFBFBD>肪<EFBFBD><E882AA><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A
|
その後で本来の順番のブロックを認識できなくなってしまう問題がありますが、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̃A<EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>ł͌<C582><CD8C>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԂɊւ<C98A><D682>炸<EFBFBD><E782B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƔF<C694><46><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
このアプリケーションでは検出した順番に関わらずきちんと認識します。
|
||||||
<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̌<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1<>o<EFBFBD>C<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><C288>v<EFBFBD><76><EFBFBD><EFBFBD><EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>ׂĂ<D782><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߎ<EFBFBD><DF8E>Ԃ͂<D482><CD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A
|
破損部分の検査で 1バイトずつ一致するブロックを調べていくため時間はかかりますが、
|
||||||
<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>葽<EFBFBD><E891BD><EFBFBD>̗<EFBFBD><CC97>p<EFBFBD>\<5C>ȃu<C883><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD><6F><EFBFBD>邩<EFBFBD><E982A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
破損したファイルからより多くの利用可能なブロックを検出するかもしれません。
|
||||||
|
|
||||||
<EFBFBD>@QuickPar <EFBFBD>͔j<EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۂɁA<C981><41><EFBFBD><EFBFBD><EFBFBD>̔j<CC94><6A><EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>̈ʒu<CA92>ƏC<C68F><43><EFBFBD>Ɏg<C98E><67>
|
QuickPar は破損ファイルを修復する際に、特定の破損ブロックの位置と修復に使う
|
||||||
<EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>̑g<EFBFBD>ݍ<EFBFBD><EFBFBD>킹<EFBFBD>ɂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ẮA<EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>̐<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>Ă<EFBFBD>
|
パリティ・ブロックの組み合わせによっては、パリティ・ブロックの数が足りていても
|
||||||
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>́A<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>Ɏg<EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD>
|
修復できないことがあります。そういう時は、修復に使うパリティ・ブロックを
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƂŕύX<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><EFBFBD>ǂ<EFBFBD><EFBFBD>ȍ<EFBFBD><EFBFBD>Ƃ<EFBFBD><EFBFBD>K<EFBFBD>v<EFBFBD>ɂȂ<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
手作業で変更するというめんどうな作業が必要になります。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̃A<EFBFBD>v<EFBFBD><EFBFBD><EFBFBD>P<EFBFBD>[<5B>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>ł͖<C582><CD96><EFBFBD><EFBFBD>̂<EFBFBD><CC82><EFBFBD><EFBFBD>p<EFBFBD><70><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ď<EFBFBD><C48E><EFBFBD><EFBFBD>I<EFBFBD><49>
|
このアプリケーションでは問題のあるパリティ・ブロックを除いて自動的に
|
||||||
<EFBFBD>ēx<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>邩<EFBFBD><EFBFBD><EFBFBD>݂Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂Ŋy<EFBFBD>ł<EFBFBD><EFBFBD>B
|
再度修復できるか試みてくれるので楽です。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD>ꂽ<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>Ɠ<EFBFBD><C693><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>݂<EFBFBD><DD82>ė<EFBFBD><C497>p<EFBFBD>ł<EFBFBD><C582>邩<EFBFBD><E982A9>
|
失われたソース・ブロックと同じ内容のブロックが存在して利用できるかを
|
||||||
<EFBFBD>`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD>T<EFBFBD><54><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>Č<EFBFBD><C48C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>͒<EFBFBD><CD92>ڃR<DA83>s<EFBFBD>[<5B><><EFBFBD>܂<EFBFBD><DC82>B
|
チェックサムを使って検索し、見つかった場合は直接コピーします。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̂<EFBFBD><EFBFBD>߁A<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>̃\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂܂<DC82><DC82>鎞<EFBFBD>́A
|
そのため、同じ内容のソース・ブロックが複数含まれる時は、
|
||||||
<EFBFBD>C<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̌v<EFBFBD>Z<EFBFBD>ʂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƌ<EFBFBD><EFBFBD>ɏ<EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>ł<EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
修復時の計算量が減ると共に少ないパリティ・ブロックでも修復できます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>ɓ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>܂܂<DC82><DC82><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>AQuickPar <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><43><EFBFBD>ł<EFBFBD><C582><EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
部分的に同じ内容のファイルが含まれるなら、QuickPar よりも修復できる可能性が高いです。
|
||||||
|
|
||||||
<EFBFBD>@<40>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><59> 4<>o<EFBFBD>C<EFBFBD>g<EFBFBD>̏ꍇ<CC8F>́A
|
ブロック・サイズが 4バイトの場合は、
|
||||||
<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>̃`<60>F<EFBFBD>b<EFBFBD>N<EFBFBD>T<EFBFBD><54><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD>t<EFBFBD>Z<EFBFBD><5A><EFBFBD><EFBFBD><EFBFBD>̂ŁA
|
破損したソース・ブロックのチェックサムから内容を逆算するので、
|
||||||
<EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>ŏC<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
パリティ・ブロックを全く使わないで修復することができます。
|
||||||
<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><EFBFBD> 8<>o<EFBFBD>C<EFBFBD>g<EFBFBD>̏ꍇ<CC8F>̏<EFBFBD><CC8F><EFBFBD><EFBFBD>́A
|
ブロック・サイズが 8バイトの場合の処理は、
|
||||||
1<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>Z<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ɉ<EFBFBD><EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂Ŏ<CC82><C58E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
1ブロックを逆算するのに何十分もかかるので実装していません。
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>ɂ͂<C982><CD82><EFBFBD><EFBFBD>̂Ŋ<CC82><C58A>]<5D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 8<>o<EFBFBD>C<EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>lj<EFBFBD><C789>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
ソース・コード上にはあるので希望があれば 8バイト用も追加できます。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̍<EFBFBD><CC8D>v<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><59><EFBFBD><EFBFBD><F382AB83><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>ʂ̔<CA82><CC94><EFBFBD><EFBFBD>ȉ<EFBFBD><C889>Ȃ<EFBFBD><C882>A
|
扱うファイルの合計サイズが空きメモリー量の半分以下ならば、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD> PAR 2.0 <EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƍ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɏC<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD>B
|
他の PAR 2.0 クライアントよりもずっと高速に修復します。
|
||||||
<EFBFBD>}<7D><><EFBFBD>`<60>E<EFBFBD>R<EFBFBD>A CPU <20>ɑΉ<C991><CE89><EFBFBD><EFBFBD>ă}<7D><><EFBFBD>`<60>E<EFBFBD>X<EFBFBD><58><EFBFBD>b<EFBFBD>h<EFBFBD>ōs<C58D>Z<F189898E><5A>
|
マルチ・コア CPU に対応してマルチ・スレッドで行列演算と
|
||||||
<EFBFBD><EFBFBD><EFBFBD>[<5B>h<EFBFBD>E<EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̌v<CC8C>Z<EFBFBD><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁACPU <20>R<EFBFBD>A<EFBFBD><41> 2<>ȏ゠<C88F><E382A0><EFBFBD>ƍX<C68D>ɑ<EFBFBD><C991><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>܂<EFBFBD><DC82>B
|
リード・ソロモン符号の計算をするので、CPU コアが 2個以上あると更に速くなります。
|
||||||
<EFBFBD>V<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>R<EFBFBD>A<EFBFBD>ł<EFBFBD> QuickPar <EFBFBD><EFBFBD> 2<>{<7B>A
|
シングル・コアでも QuickPar の 2倍、
|
||||||
<EFBFBD>f<EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>R<EFBFBD>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD> QuickPar <20><> 3<>{<7B><><EFBFBD>炢<EFBFBD>̑<EFBFBD><CC91>x<EFBFBD><78><EFBFBD>ł܂<C582><DC82>B
|
デュアル・コアだと QuickPar の 3倍ぐらいの速度がでます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>傫<EFBFBD><E582AB><EFBFBD>ƁA
|
ただし、空きメモリーが少なかったりファイルが大きいと、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>ċɒ[<5B>ɏ<EFBFBD><C98F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD><78><EFBFBD>ቺ<EFBFBD><E189BA><EFBFBD>܂<EFBFBD><DC82>B
|
効率が悪くなって極端に処理速度が低下します。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>{<7B><><EFBFBD>̊J<CC8A><4A><EFBFBD><EFBFBD><C28B>ō<EFBFBD><C58D><EFBFBD><EFBFBD>Ă<EFBFBD><C482>̂ŁA
|
日本語の開発環境で作ってるので、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>{<7B><><EFBFBD>̃t<CC83>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>f<EFBFBD>B<EFBFBD><42><EFBFBD>N<EFBFBD>g<EFBFBD><67><EFBFBD>ɑΉ<C991><CE89><EFBFBD><EFBFBD>Ă܂<C482><DC82>B
|
日本語のファイル名やディレクトリに対応してます。
|
||||||
4GB <EFBFBD>ȏ<EFBFBD><EFBFBD>̃t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ɂ<EFBFBD><C982>Ή<EFBFBD><CE89><EFBFBD><EFBFBD>Ă܂<C482><DC82><EFBFBD><EFBFBD>A
|
4GB 以上のファイルにも対応してますが、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD>̓t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>E<EFBFBD>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>x<EFBFBD>ɑ傫<C991><E582AB><EFBFBD>ˑ<EFBFBD><CB91><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
検査や修復速度はファイル・アクセス速度に大きく依存します。
|
||||||
|
|
||||||
<EFBFBD>@<40>J<EFBFBD><4A><EFBFBD>Ҍ<EFBFBD><D28C><EFBFBD><EFBFBD>ɁA
|
開発者向けに、
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>̂ŁA<C581>ׂ<EFBFBD><D782><EFBFBD><EFBFBD>d<EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ŕύX<CF8D>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
ソース・コードが公開されてるので、細かい仕様を自分で変更できます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɕs<EFBFBD><EFBFBD><EFBFBD>ȓ_<EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>O<EFBFBD><EFBFBD><EFBFBD>ۂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ŋm<EFBFBD>F<EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>Ĉ<EFBFBD><EFBFBD>S<EFBFBD>ł<EFBFBD><EFBFBD>B
|
動作に不明な点やバグっぽい挙動があっても、自分で確認することができて安心です。
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>E<EFBFBD><45><EFBFBD>X<EFBFBD>g<EFBFBD>Ŏw<C58E>肷<EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
ソース・ファイルをファイル・リストで指定することができます。
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ƃ<EFBFBD><C683>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>قȂ<D982><C882>ꏊ<EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
ソース・ファイルとリカバリ・ファイルが異なる場所にあっても処理できます。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ẮA
|
制限事項としては、
|
||||||
<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><EFBFBD> 2 GB <20><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ή<EFBFBD><CE89><EFBFBD><EFBFBD>Ă܂<C482><DC82><EFBFBD><EFBFBD>B
|
ブロック・サイズは 2 GB 未満にしか対応してません。
|
||||||
<EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>v<EFBFBD>Z<EFBFBD>Ɋ܂߂Ȃ<EFBFBD><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43> (<28>m<EFBFBD><6D><EFBFBD>E<EFBFBD><45><EFBFBD>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>Z<EFBFBD>b<EFBFBD>g) <20>̎w<CC8E><77><EFBFBD>͂ł<CD82><C582>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
パリティ計算に含めないファイル (ノン・リカバリ・セット) の指定はできません。
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>͍ő<CD8D><C591><EFBFBD> 32768<36>܂łł<C582><C582>B(<28>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 65536<EFBFBD>܂<EFBFBD>)
|
ソース・ブロックは最大で 32768個までです。(ファイル数は 65536個まで)
|
||||||
<EFBFBD>쐬<EFBFBD>ł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD>e<EFBFBD>B<EFBFBD>E<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>͍ő<EFBFBD><EFBFBD><EFBFBD> 65535<33>܂łł<C582><C582>B
|
作成できるパリティ・ブロックは最大で 65535個までです。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>ӓ_<D393>̓<EFBFBD><CD83><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ʂ<EFBFBD><CA82>c<EFBFBD><63><EFBFBD>Ȃ<EFBFBD><C882>Ƃł<C682><C582>B
|
注意点はメモリー消費量が膨大なことです。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>J<EFBFBD>o<EFBFBD><EFBFBD><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>ŏC<C58F><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۂɂ́A<CD81><41><EFBFBD>[<5B>h<EFBFBD>E<EFBFBD>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̍s<CC8D><73><EFBFBD><EFBFBD><EFBFBD>ϊ<EFBFBD><CF8A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ׂ<EFBFBD>
|
リカバリ・ファイルで修復する際には、リード・ソロモン符号の行列を変換する為に
|
||||||
<EFBFBD>u <20>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E> * <20><><EFBFBD><EFBFBD><EFBFBD>ꂽ<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E> * 2 <20>v<EFBFBD>̃<EFBFBD><CC83><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>K<EFBFBD>v<EFBFBD>Ƃ<EFBFBD><C682>܂<EFBFBD><DC82>B
|
「 ソース・ブロック数 * 失われたソース・ブロック数 * 2 」のメモリーを必要とします。
|
||||||
<EFBFBD>Ⴆ<EFBFBD>A<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ő<EFBFBD><EFBFBD><EFBFBD> 32768 <20>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>ƁA25% <20>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><F0959C8C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD>
|
例えば、ブロック数を最大の 32768 にすると、25% のブロックを復元するには
|
||||||
32768 * 8192 * 2 = 500MB <EFBFBD>ȏ<EFBFBD><EFBFBD>̃<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>K<EFBFBD>v<EFBFBD>Ƃ<EFBFBD><C682>܂<EFBFBD><DC82>B
|
32768 * 8192 * 2 = 500MB 以上のメモリーを必要とします。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>ʂ͏璷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>傫<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ͖<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>S<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><EFBFBD>܂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ŁA
|
普通は冗長性を大きくすることは無いし、全ブロックが破損することもまず無いので、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>ۂɎg<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>郁<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>͂<EFBFBD><CD82><EFBFBD><EFBFBD>Ə<EFBFBD><C68F>Ȃ<EFBFBD><C882>ł<EFBFBD><C582><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>G<CE83><47><EFBFBD>[<5B>ɂȂ<C982><C882>܂<EFBFBD><DC82>B
|
実際に使われるメモリーはもっと少ないですが、足りなければエラーになります。
|
||||||
|
|
||||||
<EFBFBD>@<40>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>E<EFBFBD>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD>p<EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>[<5B>́u (<28>\<5C>[<5B>X<EFBFBD>E<EFBFBD>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E> + 2) * <20>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y <20>v
|
ファイル・アクセス用バッファーは「 (ソース・ブロック数 + 2) * ブロック・サイズ 」
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>{<7B>̑傫<CC91><E582AB><EFBFBD>ɂȂ<C982><C882>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>ꍇ<EFBFBD>̓u<CD83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD>f<EFBFBD>Љ<EFBFBD><D089><EFBFBD><EFBFBD>ď<EFBFBD><C48F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
が基本の大きさになり、メモリーが足りない場合はブロックを断片化して処理します。
|
||||||
<EFBFBD>f<EFBFBD>ЃT<EFBFBD>C<EFBFBD>Y<EFBFBD>́u 1KB<4B>`<60>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD>E<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD>̔<EFBFBD><CC94><EFBFBD> <20>v<EFBFBD>ł<EFBFBD><C582>B
|
断片サイズは「 1KB~ブロック・サイズの半分 」です。
|
||||||
<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ׂ̃<D782><CC83><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>D<EFBFBD>悵<EFBFBD>āA<C481><EFBFBD><F382AB83><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>ꍇ<EFBFBD>ɂ́A
|
行列を格納する為のメモリーを優先して、空きメモリーが足りない場合には、
|
||||||
<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>E<EFBFBD>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD>p<EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>[<5B><><EFBFBD><EFBFBD><EFBFBD>炵<EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>G<CE83><47><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
ファイル・アクセス用バッファーを減らしますが、それでも足りなければエラーが発生します。
|
||||||
<EFBFBD>܂<EFBFBD><EFBFBD>A<EFBFBD>u<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD>N<EFBFBD>̒f<EFBFBD>Љ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƌɒ[<5B>ɏ<EFBFBD><C98F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>x<EFBFBD><78><EFBFBD>ቺ<EFBFBD><E189BA><EFBFBD>܂<EFBFBD><DC82>B
|
また、ブロックの断片化が激しいと極端に処理速度が低下します。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>J<EFBFBD>o<EFBFBD><6F><EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̌<EFBFBD><CC8C><EFBFBD><EFBFBD>ł́A
|
リカバリ・ファイルやソース・ファイルの検査では、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>\<5C><><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă<EFBFBD> CPU <20><><EFBFBD>\<5C><><EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>E<EFBFBD>A<EFBFBD>N<EFBFBD>Z<EFBFBD>X<EFBFBD><58><EFBFBD>x<EFBFBD>Ȃǂɂ<C782><C982><EFBFBD><EFBFBD>ẮA
|
メモリーが十分にあっても CPU 性能やファイル・アクセス速度などによっては、
|
||||||
<EFBFBD>傫<EFBFBD>ȃt<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̌<EFBFBD><CC8C><EFBFBD><EFBFBD>ɉ<EFBFBD><C989><EFBFBD><EFBFBD><EFBFBD><EFBFBD>҂<D282><C282>ƂɂȂ邩<C882><E982A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B
|
大きなファイルの検査に何分も待つことになるかもしれません。
|
||||||
<EFBFBD>W<EFBFBD><EFBFBD><EFBFBD>ł̓<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>ʂ<EFBFBD><CA82>\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ΏڍׂȌ<D782><C88C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>ΊȈՌ<C888><D58C><EFBFBD><EFBFBD>ɂȂ<C982><C882>܂<EFBFBD><DC82>B
|
標準ではメモリー量が十分あれば詳細な検査を行い、足りなければ簡易検査になります。
|
||||||
<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă邩<EFBFBD>ǂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̊m<EFBFBD>F<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̏ꍇ<EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>j<EFBFBD><EFBFBD><EFBFBD>̒<EFBFBD><EFBFBD>x<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꍇ<EFBFBD>́A
|
破損してるかどうかの確認をしたいだけの場合や、破損の程度が小さい場合は、
|
||||||
<EFBFBD>ȈՌ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><EFBFBD>\<5C><><EFBFBD>Ȃ̂ŁA<C581>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>ŏڍ<DA8D><D78C><EFBFBD><EFBFBD><EFBFBD><F096B38C>ɂ<EFBFBD><C982>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B
|
簡易検査でも十分なので、オプションで詳細検査を無効にすることもできます。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><C28B><EFBFBD> Windows Vista <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~ (Windows 7, 8, 10, 11) <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>\<5C>R<EFBFBD><52><EFBFBD>ł<EFBFBD><C582>B
|
動作環境は Windows 7 かそれ以降 (Windows 8, 10, 11) が動くパソコンです。
|
||||||
Win32 API <EFBFBD><EFBFBD> VC <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482>̂ŁA
|
Win32 API と VC ランタイムを使ってるので、
|
||||||
<EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD>R<EFBFBD><52><EFBFBD>p<EFBFBD>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> Visual Studio 2022 <EFBFBD>ȍ~<7E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD><C582>B
|
ソース・コードをコンパイルするには Visual Studio 2022 以降が必要です。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ <EFBFBD>Q<EFBFBD>l<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>◘<EFBFBD>p<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>A<EFBFBD><41><EFBFBD>C<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>[<5B>Ȃ<EFBFBD> ]
|
[ 参考文献や利用したソース・コード、ライブラリーなど ]
|
||||||
|
|
||||||
par2-specifications.pdf
|
par2-specifications.pdf
|
||||||
Parity Volume Set Specification 2.0
|
Parity Volume Set Specification 2.0
|
||||||
@@ -220,31 +220,31 @@ This module is Public Domain.
|
|||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ <EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>Z<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>Ȃ<EFBFBD> ]
|
[ ライセンスなど ]
|
||||||
|
|
||||||
<EFBFBD>@PAR 2.0 <EFBFBD>̃t<EFBFBD>H<EFBFBD>[<5B>}<7D>b<EFBFBD>g<EFBFBD>ɂ<C982><C282>Ă͐<C482><CD90><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>āA
|
PAR 2.0 のフォーマットについては説明書や実装コードを見て、
|
||||||
<EFBFBD>݊<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ێ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĂȂ<EFBFBD><EFBFBD>ׂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂȂ<EFBFBD><EFBFBD>悤<EFBFBD>ɂ<EFBFBD><EFBFBD>Ă܂<EFBFBD><EFBFBD>B
|
互換性を維持してなるべく同じになるようにしてます。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>̐l<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>𗬗p<F097AC97><70><EFBFBD>Ă镔<C482><E99594><EFBFBD>̒<EFBFBD><CC92>쌠<EFBFBD>͂<EFBFBD><CD82>̐l<CC90>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
他の人が書いたコードを流用してる部分の著作権はその人にあります。
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȊO<EFBFBD>̕<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̒<EFBFBD><EFBFBD>쌠<EFBFBD><EFBFBD> <20>V<EFBFBD>c <20>L <20>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
それ以外の部分の著作権は 澤田 豊 にあります。
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>C<EFBFBD>Z<EFBFBD><5A><EFBFBD>X<EFBFBD><58> GPL <20>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̂ɏ<CC82><C98F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
ライセンスは GPL というものに準拠します。
|
||||||
par2cmdline <EFBFBD><EFBFBD> phpar2 <EFBFBD>̃R<EFBFBD>[<5B>h<EFBFBD>𗬗p<F097AC97><70><EFBFBD>Ă<EFBFBD><C482>āA<C481><41><EFBFBD><EFBFBD><EFBFBD>炪 GPL <20>Ŕz<C594>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>Ă邩<C482><E982A9><EFBFBD>ł<EFBFBD><C582>B
|
par2cmdline や phpar2 のコードを流用していて、それらが GPL で配布されてるからです。
|
||||||
GPL <EFBFBD>̃<EFBFBD><EFBFBD>C<EFBFBD>Z<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>̏ڍׂ͂悭<EFBFBD>킩<EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><EFBFBD>̂ł<EFBFBD><EFBFBD><EFBFBD><EFBFBD>A
|
GPL のライセンスの詳細はよくわからないのですが、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƂȂ<EFBFBD><EFBFBD>g<EFBFBD><EFBFBD><EFBFBD>ă\<5C>[<5B>X<EFBFBD>E<EFBFBD>R<EFBFBD>[<5B>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>J<EFBFBD><4A><EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>݂<EFBFBD><DD82><EFBFBD><EFBFBD>ł<EFBFBD><C582>B
|
利用料を払うことなく使えてソース・コードを公開することが条件みたいです。
|
||||||
<EFBFBD>ڂ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ͕t<EFBFBD><EFBFBD><EFBFBD>̉p<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C<EFBFBD>Z<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǂނ<EFBFBD><EFBFBD>A
|
詳しいことは付属の英文ライセンス文を読むか、
|
||||||
<EFBFBD><EFBFBD><EFBFBD>{<7B><><EFBFBD>̉<EFBFBD><CC89><EFBFBD><EFBFBD>ł<EFBFBD><C582>T<EFBFBD><54><EFBFBD>ēǂ<C493><C782>ł݂Ă<DD82><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
日本語の解説でも探して読んでみてください。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
[ <EFBFBD>A<EFBFBD><EFBFBD><EFBFBD><EFBFBD> ]
|
[ 連絡先 ]
|
||||||
|
|
||||||
<EFBFBD>@<40><><EFBFBD>͂<EFBFBD><CD82>܂<EFBFBD> (<28>T<EFBFBD>ꂮ<EFBFBD>炢) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>m<EFBFBD>F<EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82>A
|
私はたまに (週一ぐらい) しかメール確認できませんし、
|
||||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28>ꃖ<EFBFBD><EA8396><EFBFBD><EFBFBD><EFBFBD>炢) <20>C<EFBFBD><43><EFBFBD>^<5E>[<5B>l<EFBFBD>b<EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD><67><EFBFBD>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B
|
長期間 (一ヶ月ぐらい) インターネットを使えないこともあります。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>{<7B>I<EFBFBD>ɃT<C983>|<7C>[<5B>g<EFBFBD>̓<EFBFBD><CD83>[<5B><><EFBFBD>ōs<C58D><73><EFBFBD><EFBFBD><EFBFBD>ƂɂȂ<C982><C882>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A
|
基本的にサポートはメールで行うことになりますが、
|
||||||
<EFBFBD>Ԏ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD>邩<EFBFBD>͋C<EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><EFBFBD>҂<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
返事がいつ戻ってくるかは気長にお待ちください。
|
||||||
|
|
||||||
<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD> <20>V<EFBFBD>c <20>L <20>ł<EFBFBD><C582>B
|
名前は 澤田 豊 です。
|
||||||
<EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD>E<EFBFBD>A<EFBFBD>h<EFBFBD><68><EFBFBD>X<EFBFBD><58> tenfon (at mark) outlook.jp <EFBFBD>ł<EFBFBD>
|
メール・アドレスは tenfon (at mark) outlook.jp です
|
||||||
<EFBFBD><EFBFBD><EFBFBD>f<EFBFBD><EFBFBD><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD>ۂ̕\<5C>L<EFBFBD>Ȃ̂ŁA<C581><41><EFBFBD>ۂ̃<DB82><CC83>[<5B><><EFBFBD>ł<EFBFBD> (at mark) <EFBFBD><EFBFBD> @ <EFBFBD>Ɋ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B
|
迷惑メール拒否の表記なので、実際のメールでは (at mark) を @ に換えてください。
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// com.c
|
// com.c
|
||||||
// Copyright : 2022-01-30 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// common2.c
|
// common2.c
|
||||||
// Copyright : 2023-09-23 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
@@ -1848,7 +1848,7 @@ int sqrt32(int num)
|
|||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
int cpu_num = 1; // CPU/Core 個数が制限されてる場合は、上位に本来の数を置く
|
int cpu_num = 1; // CPU/Core 個数が制限されてる場合は、上位に本来の数を置く
|
||||||
// /arch:SSE2, +1=SSSE3, +2=SSE4.1, +4=SSE4.2, +8=CLMUL, +16=AVX2, +128=JIT(SSE2), +256=Old
|
// /arch:SSE2, +1=SSSE3, +2=SSE4.1, +4=SSE4.2, +8=CLMUL, +16=AVX2, +128=JIT(SSE2), +256=ALTMAPなし
|
||||||
// 上位 16-bit = L2 cache サイズから計算した制限サイズ
|
// 上位 16-bit = L2 cache サイズから計算した制限サイズ
|
||||||
unsigned int cpu_flag = 0;
|
unsigned int cpu_flag = 0;
|
||||||
unsigned int cpu_cache = 0; // 上位 16-bit = L3 cache の制限サイズ, 下位 16-bit = 同時処理数
|
unsigned int cpu_cache = 0; // 上位 16-bit = L3 cache の制限サイズ, 下位 16-bit = 同時処理数
|
||||||
@@ -2008,8 +2008,11 @@ void check_cpu(void)
|
|||||||
if (cache3_size > 0){
|
if (cache3_size > 0){
|
||||||
//printf("L3 cache: %d KB (%d way)\n", cache3_size >> 10 , cache3_way);
|
//printf("L3 cache: %d KB (%d way)\n", cache3_size >> 10 , cache3_way);
|
||||||
cpu_cache = cache3_size / cache3_way; // set-associative のサイズにする
|
cpu_cache = cache3_size / cache3_way; // set-associative のサイズにする
|
||||||
if (cpu_cache < 131072)
|
if (cpu_cache < 131072){
|
||||||
cpu_cache = 128 << 10; // 128 KB 以上にする
|
cpu_cache = 128 << 10; // 128 KB 以上にする
|
||||||
|
} else {
|
||||||
|
cpu_cache = (cpu_cache + 0xFFFF) & 0xFFFF0000; // 64 KB の倍数にする
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (cache2_size > 0){
|
if (cache2_size > 0){
|
||||||
//printf("L2 cache: %d KB (%d way)\n", cache2_size >> 10, cache2_way);
|
//printf("L2 cache: %d KB (%d way)\n", cache2_size >> 10, cache2_way);
|
||||||
@@ -2030,7 +2033,9 @@ void check_cpu(void)
|
|||||||
returnLength += returnLength / 2;
|
returnLength += returnLength / 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cpu_cache |= returnLength & 0x1FFFF;
|
if (returnLength > 0x8000)
|
||||||
|
returnLength = 0x8000;
|
||||||
|
cpu_cache |= returnLength & 0xFFFF;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2038,7 +2043,7 @@ void check_cpu(void)
|
|||||||
limit_size = 128 << 10;
|
limit_size = 128 << 10;
|
||||||
//printf("Limit size of Cache Blocking: %d KB\n", limit_size >> 10);
|
//printf("Limit size of Cache Blocking: %d KB\n", limit_size >> 10);
|
||||||
// cpu_flag の上位 16-bit にキャッシュの制限サイズを置く
|
// cpu_flag の上位 16-bit にキャッシュの制限サイズを置く
|
||||||
cpu_flag |= limit_size & 0xFFFF0000; // 64 KB 未満は無視する
|
cpu_flag |= (limit_size + 0xFFFF) & 0xFFFF0000; // 64 KB の倍数にする
|
||||||
|
|
||||||
if (core_count == 0){ // 物理コア数が不明なら、論理コア数と同じにする
|
if (core_count == 0){ // 物理コア数が不明なら、論理コア数と同じにする
|
||||||
core_count = cpu_num;
|
core_count = cpu_num;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
// crc.c
|
// crc.c
|
||||||
// Copyright : 2022-02-09 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// create.c
|
// create.c
|
||||||
// Copyright : 2023-09-23 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
@@ -26,6 +26,11 @@
|
|||||||
|
|
||||||
//#define TIMER // 実験用
|
//#define TIMER // 実験用
|
||||||
|
|
||||||
|
#ifdef TIMER
|
||||||
|
#include <time.h>
|
||||||
|
static double time_sec, time_speed;
|
||||||
|
#endif
|
||||||
|
|
||||||
// ソート時に項目を比較する
|
// ソート時に項目を比較する
|
||||||
static int sort_cmp(const void *elem1, const void *elem2)
|
static int sort_cmp(const void *elem1, const void *elem2)
|
||||||
{
|
{
|
||||||
@@ -196,7 +201,7 @@ int set_common_packet(
|
|||||||
__int64 prog_now = 0;
|
__int64 prog_now = 0;
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
print_progress_text(0, "Computing file hash");
|
print_progress_text(0, "Computing file hash");
|
||||||
|
|
||||||
@@ -305,14 +310,14 @@ unsigned int time_start = GetTickCount();
|
|||||||
off += (64 + main_packet_size);
|
off += (64 + main_packet_size);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("hash %d.%03d sec", time_start / 1000, time_start % 1000);
|
time_sec = (double)time_start / CLOCKS_PER_SEC;
|
||||||
if (time_start > 0){
|
if (time_sec > 0){
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_start * 131072));
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
printf(", %d MB/s\n", time_start);
|
|
||||||
} else {
|
} else {
|
||||||
printf("\n");
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
|
printf("hash %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
error_end:
|
error_end:
|
||||||
@@ -320,7 +325,7 @@ error_end:
|
|||||||
return off;
|
return off;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_MULTI_READ 4 // SSDで同時に読み込む最大ファイル数
|
#define MAX_MULTI_READ 6 // SSDで同時に読み込む最大ファイル数
|
||||||
|
|
||||||
// SSD 上で複数ファイルのハッシュ値を同時に求めるバージョン
|
// SSD 上で複数ファイルのハッシュ値を同時に求めるバージョン
|
||||||
int set_common_packet_multi(
|
int set_common_packet_multi(
|
||||||
@@ -341,18 +346,16 @@ int set_common_packet_multi(
|
|||||||
FILE_HASH_TH th[MAX_MULTI_READ];
|
FILE_HASH_TH th[MAX_MULTI_READ];
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
memset(hSub, 0, sizeof(HANDLE) * MAX_MULTI_READ);
|
memset(hSub, 0, sizeof(HANDLE) * MAX_MULTI_READ);
|
||||||
memset(th, 0, sizeof(FILE_HASH_TH) * MAX_MULTI_READ);
|
memset(th, 0, sizeof(FILE_HASH_TH) * MAX_MULTI_READ);
|
||||||
// Core数に応じてスレッド数を増やす
|
// Core数に応じてスレッド数を増やす
|
||||||
if ((memory_use & 32) != 0){ // NVMe SSD
|
if ((memory_use & 32) != 0){ // NVMe SSD
|
||||||
if (cpu_num >= 8){ // 8 ~ 16 Cores
|
multi_read = (cpu_num + 2) / 3 + 1; // 3=2, 4~6=3, 7~9=4, 10~12=5, 13~=6
|
||||||
multi_read = 4;
|
if (multi_read > MAX_MULTI_READ)
|
||||||
} else { // 3 Cores + Hyper-threading, or 4 ~ 7 Cores
|
multi_read = MAX_MULTI_READ;
|
||||||
multi_read = 3;
|
|
||||||
}
|
|
||||||
} else { // SATA SSD
|
} else { // SATA SSD
|
||||||
multi_read = 2;
|
multi_read = 2;
|
||||||
}
|
}
|
||||||
@@ -547,14 +550,14 @@ unsigned int time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
print_progress_done(); // 改行して行の先頭に戻しておく
|
print_progress_done(); // 改行して行の先頭に戻しておく
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("hash %d.%03d sec", time_start / 1000, time_start % 1000);
|
time_sec = (double)time_start / CLOCKS_PER_SEC;
|
||||||
if (time_start > 0){
|
if (time_sec > 0){
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_start * 131072));
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
printf(", %d MB/s\n", time_start);
|
|
||||||
} else {
|
} else {
|
||||||
printf("\n");
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
|
printf("hash %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
error_end:
|
error_end:
|
||||||
@@ -702,7 +705,7 @@ int set_common_packet_hash(
|
|||||||
__int64 prog_now = 0;
|
__int64 prog_now = 0;
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
print_progress_text(0, "Computing file hash");
|
print_progress_text(0, "Computing file hash");
|
||||||
|
|
||||||
@@ -742,8 +745,8 @@ unsigned int time_start = GetTickCount();
|
|||||||
print_progress_done(); // 改行して行の先頭に戻しておく
|
print_progress_done(); // 改行して行の先頭に戻しておく
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("hash %d.%03d sec\n", time_start / 1000, time_start % 1000);
|
printf("hash %.3f sec\n", (double)time_start / CLOCKS_PER_SEC);
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -1067,7 +1070,7 @@ int create_recovery_file(
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
print_progress_text(0, "Constructing recovery file");
|
print_progress_text(0, "Constructing recovery file");
|
||||||
time_last = GetTickCount();
|
time_last = GetTickCount();
|
||||||
@@ -1260,8 +1263,8 @@ unsigned int time_start = GetTickCount();
|
|||||||
print_progress_done(); // 改行して行の先頭に戻しておく
|
print_progress_done(); // 改行して行の先頭に戻しておく
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("write %d.%03d sec\n", time_start / 1000, time_start % 1000);
|
printf("write %.3f sec\n", (double)time_start / CLOCKS_PER_SEC);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1282,6 +1285,7 @@ int create_recovery_file_1pass(
|
|||||||
int footer_size, // 末尾パケットのバッファー・サイズ
|
int footer_size, // 末尾パケットのバッファー・サイズ
|
||||||
HANDLE *rcv_hFile, // 各リカバリ・ファイルのハンドル
|
HANDLE *rcv_hFile, // 各リカバリ・ファイルのハンドル
|
||||||
unsigned char *p_buf, // 計算済みのパリティ・ブロック
|
unsigned char *p_buf, // 計算済みのパリティ・ブロック
|
||||||
|
unsigned char *g_buf, // GPU用 (GPUを使わない場合は NULLにすること)
|
||||||
unsigned int unit_size)
|
unsigned int unit_size)
|
||||||
{
|
{
|
||||||
unsigned char *packet_header, hash[HASH_SIZE];
|
unsigned char *packet_header, hash[HASH_SIZE];
|
||||||
@@ -1438,6 +1442,10 @@ int create_recovery_file_1pass(
|
|||||||
|
|
||||||
// Recovery Slice packet は後から書き込む
|
// Recovery Slice packet は後から書き込む
|
||||||
for (j = block_start; j < block_start + block_count; j++){
|
for (j = block_start; j < block_start + block_count; j++){
|
||||||
|
if (g_buf != NULL){ // GPUを使った場合
|
||||||
|
// CPUスレッドと GPUスレッドの計算結果を合わせる
|
||||||
|
galois_align_xor(g_buf + (size_t)unit_size * j, p_buf, unit_size);
|
||||||
|
}
|
||||||
// パリティ・ブロックのチェックサムを検証する
|
// パリティ・ブロックのチェックサムを検証する
|
||||||
checksum16_return(p_buf, hash, unit_size - HASH_SIZE);
|
checksum16_return(p_buf, hash, unit_size - HASH_SIZE);
|
||||||
if (memcmp(p_buf + unit_size - HASH_SIZE, hash, HASH_SIZE) != 0){
|
if (memcmp(p_buf + unit_size - HASH_SIZE, hash, HASH_SIZE) != 0){
|
||||||
@@ -1821,10 +1829,12 @@ int split_files(
|
|||||||
}
|
}
|
||||||
if (ext_len > 0){ // 全て数字の拡張子を持つソース・ファイルがあるなら
|
if (ext_len > 0){ // 全て数字の拡張子を持つソース・ファイルがあるなら
|
||||||
//printf_cp("\n risky name = %s \n", file_name);
|
//printf_cp("\n risky name = %s \n", file_name);
|
||||||
|
wcscpy(file_path, file_name); // 比較用に拡張子を取り除く
|
||||||
|
file_path[name_len] = 0;
|
||||||
for (num2 = 0; num2 < file_num; num2++){
|
for (num2 = 0; num2 < file_num; num2++){
|
||||||
if (num2 == num)
|
if (num2 == num)
|
||||||
continue;
|
continue;
|
||||||
if (_wcsnicmp(list_buf + files[num2].name, file_name, name_len) == 0){
|
if (_wcsicmp(list_buf + files[num2].name, file_path) == 0){
|
||||||
//printf_cp(" match name = %s \n", list_buf + files[num2].name);
|
//printf_cp(" match name = %s \n", list_buf + files[num2].name);
|
||||||
num8 = (files[num2].size + (__int64)split_size - 1) / split_size;
|
num8 = (files[num2].size + (__int64)split_size - 1) / split_size;
|
||||||
split_max = (int)num8;
|
split_max = (int)num8;
|
||||||
@@ -1835,7 +1845,7 @@ int split_files(
|
|||||||
if (((split_max < 1000) && (ext_len >= 5)) || ((split_max < 10000) && (ext_len >= 6)))
|
if (((split_max < 1000) && (ext_len >= 5)) || ((split_max < 10000) && (ext_len >= 6)))
|
||||||
continue; // 拡張子の桁数が異なる
|
continue; // 拡張子の桁数が異なる
|
||||||
// 上書きする危険性があるのでエラーにする
|
// 上書きする危険性があるのでエラーにする
|
||||||
printf_cp("split bad file, %s\n", file_name);
|
printf_cp("split bad file, %s\n", list_buf + files[num2].name);
|
||||||
*cur_num = -1;
|
*cur_num = -1;
|
||||||
*cur_id = 0;
|
*cur_id = 0;
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ int create_recovery_file_1pass(
|
|||||||
int footer_size, // 末尾パケットのバッファー・サイズ
|
int footer_size, // 末尾パケットのバッファー・サイズ
|
||||||
HANDLE *rcv_hFile, // 各リカバリ・ファイルのハンドル
|
HANDLE *rcv_hFile, // 各リカバリ・ファイルのハンドル
|
||||||
unsigned char *p_buf, // 計算済みのパリティ・ブロック
|
unsigned char *p_buf, // 計算済みのパリティ・ブロック
|
||||||
|
unsigned char *g_buf, // GPU用 (GPUを使わない場合は NULLにすること)
|
||||||
unsigned int unit_size);
|
unsigned int unit_size);
|
||||||
|
|
||||||
// 作成中のリカバリ・ファイルを削除する
|
// 作成中のリカバリ・ファイルを削除する
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -71,7 +71,6 @@ extern unsigned int cpu_flag; // declared in common2.h
|
|||||||
// CPU によって使う関数を変更する際の仮宣言
|
// CPU によって使う関数を変更する際の仮宣言
|
||||||
|
|
||||||
//#define NO_SIMD // SIMD を使わない場合
|
//#define NO_SIMD // SIMD を使わない場合
|
||||||
//#define NO_ALTMAP // SSSE3 や JIT(SSE2) の並び替えを使わない場合 (CLMULや32バイト単位は有効)
|
|
||||||
|
|
||||||
int sse_unit;
|
int sse_unit;
|
||||||
|
|
||||||
@@ -134,8 +133,11 @@ int galois_create_table(void)
|
|||||||
checksum16_altmap = checksum16;
|
checksum16_altmap = checksum16;
|
||||||
checksum16_return = checksum16;
|
checksum16_return = checksum16;
|
||||||
#ifndef NO_SIMD
|
#ifndef NO_SIMD
|
||||||
#ifndef NO_ALTMAP
|
if (cpu_flag & 256){ // AVX2, SSSE3, JIT(SSE2) の並び替えを使わない場合
|
||||||
if (cpu_flag & 16){ // AVX2 対応なら
|
// 将来的には AVX-512 などの命令に対応してもいい
|
||||||
|
//printf("\nWithout ALTMAP\n");
|
||||||
|
//sse_unit = 32;
|
||||||
|
} else if (cpu_flag & 16){ // AVX2 対応なら
|
||||||
//printf("\nUse AVX2 & ALTMAP\n");
|
//printf("\nUse AVX2 & ALTMAP\n");
|
||||||
sse_unit = 32; // 32, 64, 128 のどれでもいい
|
sse_unit = 32; // 32, 64, 128 のどれでもいい
|
||||||
galois_align_multiply = galois_align32avx_multiply;
|
galois_align_multiply = galois_align32avx_multiply;
|
||||||
@@ -145,16 +147,14 @@ int galois_create_table(void)
|
|||||||
checksum16_altmap = checksum16_altmap32;
|
checksum16_altmap = checksum16_altmap32;
|
||||||
checksum16_return = checksum16_return32;
|
checksum16_return = checksum16_return32;
|
||||||
} else if (cpu_flag & 1){ // SSSE3 対応なら
|
} else if (cpu_flag & 1){ // SSSE3 対応なら
|
||||||
if ((cpu_flag & 256) == 0){ // SSSE3 & ALTMAP を使う
|
//printf("\nUse SSSE3 & ALTMAP\n");
|
||||||
//printf("\nUse SSSE3 & ALTMAP\n");
|
sse_unit = 32; // 32, 64, 128 のどれでもいい
|
||||||
sse_unit = 32; // 32, 64, 128 のどれでもいい
|
galois_align_multiply = galois_align32_multiply;
|
||||||
galois_align_multiply = galois_align32_multiply;
|
galois_align_multiply2 = galois_align32_multiply2;
|
||||||
galois_align_multiply2 = galois_align32_multiply2;
|
galois_altmap_change = galois_altmap32_change;
|
||||||
galois_altmap_change = galois_altmap32_change;
|
galois_altmap_return = galois_altmap32_return;
|
||||||
galois_altmap_return = galois_altmap32_return;
|
checksum16_altmap = checksum16_altmap32;
|
||||||
checksum16_altmap = checksum16_altmap32;
|
checksum16_return = checksum16_return32;
|
||||||
checksum16_return = checksum16_return32;
|
|
||||||
}
|
|
||||||
} else { // SSSE3 が利用できない場合
|
} else { // SSSE3 が利用できない場合
|
||||||
if ((cpu_flag & 128) && (jit_alloc() == 0)){ // JIT(SSE2) を使う
|
if ((cpu_flag & 128) && (jit_alloc() == 0)){ // JIT(SSE2) を使う
|
||||||
//printf("\nUse JIT(SSE2) & ALTMAP\n");
|
//printf("\nUse JIT(SSE2) & ALTMAP\n");
|
||||||
@@ -167,7 +167,6 @@ int galois_create_table(void)
|
|||||||
checksum16_return = checksum16_return256;
|
checksum16_return = checksum16_return256;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2792,11 +2791,11 @@ void galois_align_xor(
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// 16バイト境界のバッファー専用の掛け算
|
// 16バイト境界のバッファー専用の掛け算 (ALTMAP しない)
|
||||||
void galois_align16_multiply(
|
void galois_align16_multiply(
|
||||||
unsigned char *r1, // Region to multiply (must be aligned by 16)
|
unsigned char *r1, // Region to multiply (must be aligned by 16)
|
||||||
unsigned char *r2, // Products go here
|
unsigned char *r2, // Products go here
|
||||||
unsigned int len, // Byte length (must be multiple of 32)
|
unsigned int len, // Byte length (must be multiple of 16)
|
||||||
int factor) // Number to multiply by
|
int factor) // Number to multiply by
|
||||||
{
|
{
|
||||||
if (factor <= 1){
|
if (factor <= 1){
|
||||||
@@ -2826,6 +2825,16 @@ void galois_align16_multiply(
|
|||||||
|
|
||||||
// 掛け算用のテーブルを常に作成する (32バイトだと少し遅くなる)
|
// 掛け算用のテーブルを常に作成する (32バイトだと少し遅くなる)
|
||||||
#ifndef NO_SIMD
|
#ifndef NO_SIMD
|
||||||
|
/*
|
||||||
|
// sse_unit が 32の倍数な時だけ
|
||||||
|
} else if (cpu_flag & 16){ // AVX2 対応なら
|
||||||
|
__declspec( align(32) ) unsigned char small_table[128];
|
||||||
|
|
||||||
|
create_eight_table_avx2(small_table, factor);
|
||||||
|
|
||||||
|
gf16_avx2_block32u(r1, r2, len, small_table);
|
||||||
|
*/
|
||||||
|
|
||||||
} else if (cpu_flag & 1){ // SSSE3 対応なら
|
} else if (cpu_flag & 1){ // SSSE3 対応なら
|
||||||
__declspec( align(16) ) unsigned char small_table[128];
|
__declspec( align(16) ) unsigned char small_table[128];
|
||||||
|
|
||||||
@@ -2869,7 +2878,6 @@ void galois_align16_multiply(
|
|||||||
len -= 8;
|
len -= 8;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
extern unsigned short *galois_log_table;
|
//extern unsigned short *galois_log_table;
|
||||||
extern unsigned int cpu_flag;
|
extern unsigned int cpu_flag;
|
||||||
|
|
||||||
int galois_create_table(void); // Returns 0 on success, -1 on failure
|
int galois_create_table(void); // Returns 0 on success, -1 on failure
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// ini.c
|
// ini.c
|
||||||
// Copyright : 2022-10-12 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// json.c
|
// json.c
|
||||||
// Copyright : 2023-02-06 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
// lib_opencl.c
|
// lib_opencl.c
|
||||||
// Copyright : 2023-09-23 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -75,7 +75,7 @@ typedef cl_int (CL_API_CALL *API_clEnqueueNDRangeKernel)(cl_command_queue, cl_ke
|
|||||||
extern unsigned int cpu_flag; // declared in common2.h
|
extern unsigned int cpu_flag; // declared in common2.h
|
||||||
extern int cpu_num;
|
extern int cpu_num;
|
||||||
|
|
||||||
#define MAX_DEVICE 3
|
#define MAX_DEVICE 8
|
||||||
|
|
||||||
HMODULE hLibOpenCL = NULL;
|
HMODULE hLibOpenCL = NULL;
|
||||||
|
|
||||||
@@ -84,7 +84,7 @@ cl_command_queue OpenCL_command = NULL;
|
|||||||
cl_kernel OpenCL_kernel = NULL;
|
cl_kernel OpenCL_kernel = NULL;
|
||||||
cl_mem OpenCL_src = NULL, OpenCL_dst = NULL, OpenCL_buf = NULL;
|
cl_mem OpenCL_src = NULL, OpenCL_dst = NULL, OpenCL_buf = NULL;
|
||||||
size_t OpenCL_group_num;
|
size_t OpenCL_group_num;
|
||||||
int OpenCL_method = 0; // 正=速い機器を選ぶ, 負=遅い機器を選ぶ
|
int OpenCL_method = 0; // 標準では GPU を使わず、動作は自動選択される
|
||||||
|
|
||||||
API_clCreateBuffer gfn_clCreateBuffer;
|
API_clCreateBuffer gfn_clCreateBuffer;
|
||||||
API_clReleaseMemObject gfn_clReleaseMemObject;
|
API_clReleaseMemObject gfn_clReleaseMemObject;
|
||||||
@@ -100,9 +100,12 @@ API_clEnqueueNDRangeKernel gfn_clEnqueueNDRangeKernel;
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
入力
|
入力
|
||||||
OpenCL_method : どのデバイスを選ぶか
|
OpenCL_method : どのデバイスや関数を選ぶか
|
||||||
|
0x100 = 速い機器を選ぶ, 0x200 = 遅い機器を選ぶ
|
||||||
|
0x10000 = 1ブロックずつ計算する, 0x20000 = 2ブロックずつ計算しようとする
|
||||||
|
0x40000 = 4-byte memory access, 0x80000 = try 16-byte memory access
|
||||||
|
0x100000 = CL_MEM_COPY_HOST_PTR, 0x200000 = CL_MEM_USE_HOST_PTR
|
||||||
unit_size : ブロックの単位サイズ
|
unit_size : ブロックの単位サイズ
|
||||||
chunk_size: 分割された断片サイズ
|
|
||||||
src_max : ソース・ブロック個数
|
src_max : ソース・ブロック個数
|
||||||
|
|
||||||
出力
|
出力
|
||||||
@@ -112,11 +115,12 @@ OpenCL_method : 動作フラグいろいろ
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// 0=成功, 1~エラー番号
|
// 0=成功, 1~エラー番号
|
||||||
int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
int init_OpenCL(unsigned int unit_size, int *src_max)
|
||||||
{
|
{
|
||||||
char buf[2048], *p_source;
|
char buf[2048], *p_source;
|
||||||
int err = 0, i, j;
|
int err = 0, i, j;
|
||||||
int gpu_power, count;
|
int gpu_power, count;
|
||||||
|
int unified_memory; // non zero = Integrated GPU
|
||||||
size_t data_size, alloc_max;
|
size_t data_size, alloc_max;
|
||||||
//FILE *fp;
|
//FILE *fp;
|
||||||
HRSRC res;
|
HRSRC res;
|
||||||
@@ -137,6 +141,7 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
API_clReleaseProgram fn_clReleaseProgram;
|
API_clReleaseProgram fn_clReleaseProgram;
|
||||||
API_clCreateKernel fn_clCreateKernel;
|
API_clCreateKernel fn_clCreateKernel;
|
||||||
API_clGetKernelWorkGroupInfo fn_clGetKernelWorkGroupInfo;
|
API_clGetKernelWorkGroupInfo fn_clGetKernelWorkGroupInfo;
|
||||||
|
API_clReleaseKernel fn_clReleaseKernel;
|
||||||
cl_int ret;
|
cl_int ret;
|
||||||
cl_uint num_platforms = 0, num_devices = 0, num_groups, param_value;
|
cl_uint num_platforms = 0, num_devices = 0, num_groups, param_value;
|
||||||
cl_ulong param_value8;
|
cl_ulong param_value8;
|
||||||
@@ -216,6 +221,9 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
fn_clGetKernelWorkGroupInfo = (API_clGetKernelWorkGroupInfo)GetProcAddress(hLibOpenCL, "clGetKernelWorkGroupInfo");
|
fn_clGetKernelWorkGroupInfo = (API_clGetKernelWorkGroupInfo)GetProcAddress(hLibOpenCL, "clGetKernelWorkGroupInfo");
|
||||||
if (fn_clGetKernelWorkGroupInfo == NULL)
|
if (fn_clGetKernelWorkGroupInfo == NULL)
|
||||||
return err;
|
return err;
|
||||||
|
fn_clReleaseKernel = (API_clReleaseKernel)GetProcAddress(hLibOpenCL, "clReleaseKernel");
|
||||||
|
if (fn_clReleaseKernel == NULL)
|
||||||
|
return err;
|
||||||
gfn_clFinish = (API_clFinish)GetProcAddress(hLibOpenCL, "clFinish");
|
gfn_clFinish = (API_clFinish)GetProcAddress(hLibOpenCL, "clFinish");
|
||||||
if (gfn_clFinish == NULL)
|
if (gfn_clFinish == NULL)
|
||||||
return err;
|
return err;
|
||||||
@@ -227,12 +235,12 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
ret = fn_clGetPlatformIDs(MAX_DEVICE, platform_id, &num_platforms);
|
ret = fn_clGetPlatformIDs(MAX_DEVICE, platform_id, &num_platforms);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 10;
|
return (ret << 8) | 10;
|
||||||
if (OpenCL_method >= 0){ // 選択する順序と初期値を変える
|
if (num_platforms > MAX_DEVICE)
|
||||||
OpenCL_method = 1;
|
num_platforms = MAX_DEVICE;
|
||||||
gpu_power = 0;
|
if (OpenCL_method & 0x200){ // 選択する順序と初期値を変える
|
||||||
} else {
|
|
||||||
OpenCL_method = -1;
|
|
||||||
gpu_power = INT_MIN;
|
gpu_power = INT_MIN;
|
||||||
|
} else {
|
||||||
|
gpu_power = 0;
|
||||||
}
|
}
|
||||||
alloc_max = 0;
|
alloc_max = 0;
|
||||||
|
|
||||||
@@ -248,6 +256,8 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
// 環境内の OpenCL 対応機器の数
|
// 環境内の OpenCL 対応機器の数
|
||||||
if (fn_clGetDeviceIDs(platform_id[i], CL_DEVICE_TYPE_GPU, MAX_DEVICE, device_id, &num_devices) != CL_SUCCESS)
|
if (fn_clGetDeviceIDs(platform_id[i], CL_DEVICE_TYPE_GPU, MAX_DEVICE, device_id, &num_devices) != CL_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
|
if (num_devices > MAX_DEVICE)
|
||||||
|
num_devices = MAX_DEVICE;
|
||||||
|
|
||||||
for (j = 0; j < (int)num_devices; j++){
|
for (j = 0; j < (int)num_devices; j++){
|
||||||
// デバイスが利用可能か確かめる
|
// デバイスが利用可能か確かめる
|
||||||
@@ -266,56 +276,42 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_VERSION, sizeof(buf), buf, NULL);
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_VERSION, sizeof(buf), buf, NULL);
|
||||||
if (ret == CL_SUCCESS)
|
if (ret == CL_SUCCESS)
|
||||||
printf("Device version = %s\n", buf);
|
printf("Device version = %s\n", buf);
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_LOCAL_MEM_SIZE, sizeof(cl_ulong), ¶m_value8, NULL);
|
|
||||||
if (ret == CL_SUCCESS)
|
|
||||||
printf("LOCAL_MEM_SIZE = %I64d KB\n", param_value8 >> 10);
|
|
||||||
|
|
||||||
// 無理とは思うけど、一応チェックする
|
|
||||||
//#define CL_DEVICE_SVM_CAPABILITIES 0x1053
|
|
||||||
//#define CL_DEVICE_SVM_COARSE_GRAIN_BUFFER (1 << 0)
|
|
||||||
//#define CL_DEVICE_SVM_FINE_GRAIN_BUFFER (1 << 1)
|
|
||||||
//#define CL_DEVICE_SVM_FINE_GRAIN_SYSTEM (1 << 2)
|
|
||||||
//#define CL_DEVICE_SVM_ATOMICS (1 << 3)
|
|
||||||
// ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_SVM_CAPABILITIES, sizeof(cl_ulong), ¶m_value8, NULL);
|
|
||||||
// if (ret == CL_INVALID_VALUE)
|
|
||||||
// printf("Shared Virtual Memory is not supported\n");
|
|
||||||
// if (ret == CL_SUCCESS)
|
|
||||||
// printf("Shared Virtual Memory = 0x%I64X\n", param_value8);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_ADDRESS_BITS, sizeof(cl_uint), ¶m_value, NULL);
|
// 取得できなくてもエラーにしない
|
||||||
if (ret != CL_SUCCESS)
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_HOST_UNIFIED_MEMORY, sizeof(cl_uint), ¶m_value, NULL);
|
||||||
continue;
|
if (ret == CL_SUCCESS){
|
||||||
|
if (param_value != 0){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("HOST_UNIFIED_MEMORY = %d\n", param_value);
|
||||||
|
#endif
|
||||||
|
param_value = 1;
|
||||||
|
}
|
||||||
|
} else { // CL_DEVICE_HOST_UNIFIED_MEMORY は OpenCL 2.0 以降で非推奨になった
|
||||||
|
param_value = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 取得できない場合はエラーにする
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(cl_ulong), ¶m_value8, NULL);
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(cl_ulong), ¶m_value8, NULL);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
printf("ADDRESS_BITS = %d\n", param_value);
|
|
||||||
printf("MAX_MEM_ALLOC_SIZE = %I64d MB\n", param_value8 >> 20);
|
printf("MAX_MEM_ALLOC_SIZE = %I64d MB\n", param_value8 >> 20);
|
||||||
#endif
|
#endif
|
||||||
if (param_value == 32){ // CL_DEVICE_ADDRESS_BITS によって確保するメモリー領域の上限を変える
|
|
||||||
if (param_value8 > 0x30000000) // 768MB までにする
|
|
||||||
param_value8 = 0x30000000;
|
|
||||||
} else { // 64-bit OS でも 2GB までにする
|
|
||||||
if (param_value8 > 0x80000000)
|
|
||||||
param_value8 = 0x80000000;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(cl_uint), &num_groups, NULL);
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(cl_uint), &num_groups, NULL);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_WORK_GROUP_SIZE, sizeof(size_t), &data_size, NULL);
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_MAX_WORK_GROUP_SIZE, sizeof(size_t), &data_size, NULL);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
// CL_DEVICE_HOST_UNIFIED_MEMORY は OpenCL 2.0 以降で非推奨になったので、参照しない
|
|
||||||
|
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
printf("MAX_COMPUTE_UNITS = %d\n", num_groups);
|
printf("MAX_COMPUTE_UNITS = %d\n", num_groups);
|
||||||
printf("MAX_WORK_GROUP_SIZE = %zd\n", data_size);
|
printf("MAX_WORK_GROUP_SIZE = %zd\n", data_size);
|
||||||
#endif
|
#endif
|
||||||
// MAX_COMPUTE_UNITS * MAX_WORK_GROUP_SIZE で計算力を測る
|
// MAX_COMPUTE_UNITS * MAX_WORK_GROUP_SIZE で計算力を測る、外付けGPUなら値を倍にする
|
||||||
count = (int)data_size * num_groups;
|
count = (2 - param_value) * (int)data_size * num_groups;
|
||||||
count *= OpenCL_method; // 符号を変える
|
if (OpenCL_method & 0x200) // Prefer slower device
|
||||||
|
count *= -1; // 符号を変える
|
||||||
//printf("prev = %d, now = %d\n", gpu_power, count);
|
//printf("prev = %d, now = %d\n", gpu_power, count);
|
||||||
if ((count > gpu_power) && (data_size >= 256) && // 256以上ないとテーブルを作れない
|
if ((count > gpu_power) && (data_size >= 256) && // 256以上ないとテーブルを作れない
|
||||||
(param_value8 / 8 > (cl_ulong)unit_size)){ // CL_DEVICE_MAX_MEM_ALLOC_SIZE に収まるか
|
(param_value8 / 8 > (cl_ulong)unit_size)){ // CL_DEVICE_MAX_MEM_ALLOC_SIZE に収まるか
|
||||||
@@ -324,14 +320,15 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
selected_platform = platform_id[i];
|
selected_platform = platform_id[i];
|
||||||
OpenCL_group_num = num_groups; // ワークグループ数は COMPUTE_UNITS 数にする
|
OpenCL_group_num = num_groups; // ワークグループ数は COMPUTE_UNITS 数にする
|
||||||
alloc_max = (size_t)param_value8;
|
alloc_max = (size_t)param_value8;
|
||||||
|
unified_memory = param_value; // 0 = discrete GPU, 1 = integrated GPU
|
||||||
|
|
||||||
// AMD Radeon ではメモリー領域が全体の 1/4 とは限らない
|
// AMD や Intel の GPU ではメモリー領域が全体の 1/4 とは限らない
|
||||||
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(cl_ulong), ¶m_value8, NULL);
|
ret = fn_clGetDeviceInfo(device_id[j], CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(cl_ulong), ¶m_value8, NULL);
|
||||||
if (ret == CL_SUCCESS){
|
if (ret == CL_SUCCESS){
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
printf("GLOBAL_MEM_SIZE = %I64d MB\n", param_value8 >> 20);
|
printf("GLOBAL_MEM_SIZE = %I64d MB\n", param_value8 >> 20);
|
||||||
#endif
|
#endif
|
||||||
// 領域一個あたりのサイズは全体の 1/4 までにする
|
// 領域一個あたりのサイズは全体の 1/4 までにする(VRAMを使いすぎると不安定になる)
|
||||||
param_value8 /= 4;
|
param_value8 /= 4;
|
||||||
if ((cl_ulong)alloc_max > param_value8)
|
if ((cl_ulong)alloc_max > param_value8)
|
||||||
alloc_max = (size_t)param_value8;
|
alloc_max = (size_t)param_value8;
|
||||||
@@ -365,31 +362,6 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 12;
|
return (ret << 8) | 12;
|
||||||
|
|
||||||
// 計算方式を選択する
|
|
||||||
if ((((cpu_flag & 0x101) == 1) || ((cpu_flag & 16) != 0)) && (sse_unit == 32)){
|
|
||||||
OpenCL_method = 2; // SSSE3 & ALTMAP または AVX2 ならデータの並び替え対応版を使う
|
|
||||||
} else if (((cpu_flag & 128) != 0) && (sse_unit == 256)){
|
|
||||||
OpenCL_method = 4; // JIT(SSE2) は bit ごとに上位から 16バイトずつ並ぶ
|
|
||||||
// ローカルのテーブルサイズが異なることに注意
|
|
||||||
// XOR 方式以外は 2KB (4バイト * 256項目 * 2個) 使う
|
|
||||||
// XOR (JIT) は 64バイト (4バイト * 16項目) 使う
|
|
||||||
} else {
|
|
||||||
OpenCL_method = 1; // 並び替えられてないデータ用
|
|
||||||
}
|
|
||||||
|
|
||||||
// work group 数が必要以上に多い場合は減らす
|
|
||||||
if (OpenCL_method == 2){
|
|
||||||
// work item 一個が 8バイトずつ計算する、256個なら work group ごとに 2KB 担当する
|
|
||||||
data_size = chunk_size / 2048;
|
|
||||||
} else {
|
|
||||||
// work item 一個が 4バイトずつ計算する、256個なら work group ごとに 1KB 担当する
|
|
||||||
data_size = chunk_size / 1024;
|
|
||||||
}
|
|
||||||
if (OpenCL_group_num > data_size){
|
|
||||||
OpenCL_group_num = data_size;
|
|
||||||
printf("Number of work groups is reduced to %zd\n", OpenCL_group_num);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 最大で何ブロック分のメモリー領域を保持できるのか(ここではまだ確保しない)
|
// 最大で何ブロック分のメモリー領域を保持できるのか(ここではまだ確保しない)
|
||||||
// 後で実際に確保する量はこれよりも少なくなる
|
// 後で実際に確保する量はこれよりも少なくなる
|
||||||
count = (int)(alloc_max / unit_size); // 確保できるメモリー量から逆算する
|
count = (int)(alloc_max / unit_size); // 確保できるメモリー量から逆算する
|
||||||
@@ -401,25 +373,6 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
printf("src buf : %zd KB (%d blocks), possible\n", data_size >> 10, count);
|
printf("src buf : %zd KB (%d blocks), possible\n", data_size >> 10, count);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 出力先はchunk 1個分だけあればいい
|
|
||||||
// CL_MEM_ALLOC_HOST_PTRを使えばpinned memoryになるらしい
|
|
||||||
data_size = (chunk_size + 63) & ~63; // cache line sizes (64 bytes) の倍数にする
|
|
||||||
OpenCL_dst = gfn_clCreateBuffer(OpenCL_context, CL_MEM_WRITE_ONLY | CL_MEM_ALLOC_HOST_PTR, data_size, NULL, &ret);
|
|
||||||
if (ret != CL_SUCCESS)
|
|
||||||
return (ret << 8) | 13;
|
|
||||||
#ifdef DEBUG_OUTPUT
|
|
||||||
printf("dst buf : %zd KB (%zd Bytes), OK\n", data_size >> 10, data_size);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// factor は最大個数分 (src_max個)
|
|
||||||
data_size = sizeof(unsigned short) * (*src_max);
|
|
||||||
OpenCL_buf = gfn_clCreateBuffer(OpenCL_context, CL_MEM_READ_ONLY, data_size, NULL, &ret);
|
|
||||||
if (ret != CL_SUCCESS)
|
|
||||||
return (ret << 8) | 14;
|
|
||||||
#ifdef DEBUG_OUTPUT
|
|
||||||
printf("factor buf : %zd Bytes (%d factors), OK\n", data_size, (*src_max));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// テキスト形式の OpenCL C ソース・コードを読み込む
|
// テキスト形式の OpenCL C ソース・コードを読み込む
|
||||||
err = 4;
|
err = 4;
|
||||||
@@ -520,18 +473,208 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
return (ret << 8) | 21;
|
return (ret << 8) | 21;
|
||||||
}
|
}
|
||||||
|
|
||||||
// カーネル関数を抽出する
|
// 計算方式を選択する
|
||||||
wsprintfA(buf, "method%d", OpenCL_method & 7);
|
if ((((cpu_flag & 0x101) == 1) || ((cpu_flag & 0x110) == 0x10)) && (sse_unit == 32)){
|
||||||
OpenCL_kernel = fn_clCreateKernel(program, buf, &ret);
|
int select_method; // SSSE3 & ALTMAP または AVX2 ならデータの並び替え対応版を使う
|
||||||
if (ret != CL_SUCCESS)
|
if (OpenCL_method & 0x80000){ // 16-byte and 2 blocks
|
||||||
return (ret << 8) | 22;
|
select_method = 12;
|
||||||
|
} else if (OpenCL_method & 0x40000){ // 4-byte and 2 blocks
|
||||||
|
select_method = 10;
|
||||||
|
} else if (OpenCL_method & 0x20000){ // 16-byte
|
||||||
|
select_method = 4;
|
||||||
|
} else if (OpenCL_method & 0x10000){ // 4-byte
|
||||||
|
select_method = 2;
|
||||||
|
} else { // kernel を作って詳細を確かめる
|
||||||
|
size_t item2, item4, item10, item12;
|
||||||
|
cl_kernel kernel2, kernel4, kernel10, kernel12;
|
||||||
|
item2 = item4 = item10 = item12 = 0;
|
||||||
|
// まずは一番重くて速い奴を調べる
|
||||||
|
wsprintfA(buf, "method%d", 12);
|
||||||
|
kernel12 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel12, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item12, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
printf("CreateKernel : %s\n", buf);
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item12);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item12 >= 32){ // 32以上あれば余裕で動くとみなす
|
||||||
|
select_method = 12;
|
||||||
|
OpenCL_kernel = kernel12;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else { // 他の奴と比較する
|
||||||
|
wsprintfA(buf, "method%d", 2);
|
||||||
|
kernel2 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel2, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item2, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item2);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item12 >= item2){
|
||||||
|
select_method = 12;
|
||||||
|
OpenCL_kernel = kernel12;
|
||||||
|
ret = fn_clReleaseKernel(kernel2);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
ret = fn_clReleaseKernel(kernel12);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
#endif
|
||||||
|
wsprintfA(buf, "method%d", 10);
|
||||||
|
kernel10 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel10, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item10, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item10);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item10 >= item2){
|
||||||
|
select_method = 10;
|
||||||
|
OpenCL_kernel = kernel10;
|
||||||
|
ret = fn_clReleaseKernel(kernel2);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
wsprintfA(buf, "method%d", 4);
|
||||||
|
kernel4 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel4, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item4, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item4);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item4 >= item2){
|
||||||
|
select_method = 4;
|
||||||
|
OpenCL_kernel = kernel4;
|
||||||
|
ret = fn_clReleaseKernel(kernel2);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
select_method = 2;
|
||||||
|
OpenCL_kernel = kernel2;
|
||||||
|
ret = fn_clReleaseKernel(kernel4);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OpenCL_method |= select_method;
|
||||||
|
} else if (((cpu_flag & 128) != 0) && (sse_unit == 256)){
|
||||||
|
OpenCL_method |= 16; // JIT(SSE2) は bit ごとに上位から 16バイトずつ並ぶ
|
||||||
|
// ローカルのテーブルサイズが異なることに注意
|
||||||
|
// XOR 方式以外は 2KB (4バイト * 256項目 * 2個) 使う
|
||||||
|
// XOR (JIT) は 64バイト (4バイト * 16項目) 使う
|
||||||
|
} else {
|
||||||
|
int select_method; // 並び替えられてないデータ用
|
||||||
|
if (OpenCL_method & 0x40000){ // 4-byte and 2 blocks
|
||||||
|
select_method = 9;
|
||||||
|
} else if (OpenCL_method & 0x10000){ // 4-byte
|
||||||
|
select_method = 1;
|
||||||
|
} else { // kernel を作って詳細を確かめる
|
||||||
|
size_t item1, item9;
|
||||||
|
cl_kernel kernel1, kernel9;
|
||||||
|
item1 = item9 = 0;
|
||||||
|
// まずは一番重くて速い奴を調べる
|
||||||
|
wsprintfA(buf, "method%d", 9);
|
||||||
|
kernel9 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel9, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item9, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item9);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item9 >= 32){ // 32以上あれば余裕で動くとみなす
|
||||||
|
select_method = 9;
|
||||||
|
OpenCL_kernel = kernel9;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else { // 他の奴と比較する
|
||||||
|
wsprintfA(buf, "method%d", 1);
|
||||||
|
kernel1 = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(kernel1, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &item1, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("\nTesting %s\n", buf);
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", item1);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (item9 >= item1){
|
||||||
|
select_method = 9;
|
||||||
|
OpenCL_kernel = kernel9;
|
||||||
|
ret = fn_clReleaseKernel(kernel1);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
select_method = 1;
|
||||||
|
OpenCL_kernel = kernel1;
|
||||||
|
ret = fn_clReleaseKernel(kernel9);
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
printf("clReleaseKernel : Failed\n");
|
||||||
|
printf("\nSelected method%d\n", select_method);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OpenCL_method |= select_method;
|
||||||
|
}
|
||||||
|
|
||||||
|
// カーネル関数を抽出する
|
||||||
|
if (OpenCL_kernel == NULL){
|
||||||
|
wsprintfA(buf, "method%d", OpenCL_method & 31);
|
||||||
|
OpenCL_kernel = fn_clCreateKernel(program, buf, &ret);
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
return (ret << 8) | 22;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("CreateKernel : %s\n", buf);
|
||||||
|
ret = fn_clGetKernelWorkGroupInfo(OpenCL_kernel, selected_device, CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), &data_size, NULL);
|
||||||
|
if (ret == CL_SUCCESS)
|
||||||
|
printf("PREFERRED_WORK_GROUP_SIZE_MULTIPLE = %zu\n", data_size);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// カーネルが実行できる work item 数を調べる
|
// カーネルが実行できる work item 数を調べる
|
||||||
ret = fn_clGetKernelWorkGroupInfo(OpenCL_kernel, NULL, CL_KERNEL_WORK_GROUP_SIZE, sizeof(size_t), &data_size, NULL);
|
ret = fn_clGetKernelWorkGroupInfo(OpenCL_kernel, selected_device, CL_KERNEL_WORK_GROUP_SIZE, sizeof(size_t), &data_size, NULL);
|
||||||
if ((ret == CL_SUCCESS) && (data_size < 256)){ // 最低でも 256以上は必要
|
if ((ret == CL_SUCCESS) && (data_size < 256)){ // 最低でも 256 以上は必要
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
printf("KERNEL_WORK_GROUP_SIZE = %zd\n", data_size);
|
printf("KERNEL_WORK_GROUP_SIZE = %zd\n", data_size);
|
||||||
#endif
|
#endif
|
||||||
@@ -550,6 +693,62 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
fn_clUnloadCompiler();
|
fn_clUnloadCompiler();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// work group 数が必要以上に多い場合は減らす
|
||||||
|
if (OpenCL_method & 4){
|
||||||
|
// work item 一個が 32バイトずつ計算する、256個なら work group ごとに 8KB 担当する
|
||||||
|
data_size = unit_size / 8192;
|
||||||
|
} else if (OpenCL_method & 2){
|
||||||
|
// work item 一個が 8バイトずつ計算する、256個なら work group ごとに 2KB 担当する
|
||||||
|
data_size = unit_size / 2048;
|
||||||
|
} else {
|
||||||
|
// work item 一個が 4バイトずつ計算する、256個なら work group ごとに 1KB 担当する
|
||||||
|
data_size = unit_size / 1024;
|
||||||
|
}
|
||||||
|
if (OpenCL_group_num > data_size){
|
||||||
|
OpenCL_group_num = data_size;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("Number of work groups is reduced to %zd\n", OpenCL_group_num);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// データへのアクセス方法をデバイスによって変える
|
||||||
|
if (OpenCL_method & 0x200000){
|
||||||
|
OpenCL_method |= 32;
|
||||||
|
} else if ((OpenCL_method & 0x100000) == 0){
|
||||||
|
if (unified_memory){
|
||||||
|
OpenCL_method |= 32; // Integrated GPU なら CL_MEM_USE_HOST_PTR を使う
|
||||||
|
} else { // Discrete GPU でも Nvidia のは動作を変える
|
||||||
|
ret = fn_clGetDeviceInfo(selected_device, CL_DEVICE_VERSION, sizeof(buf), buf, NULL);
|
||||||
|
if (ret == CL_SUCCESS){
|
||||||
|
if (strstr(buf, "CUDA") != NULL)
|
||||||
|
OpenCL_method |= 32; // NVIDIA GPU なら CL_MEM_USE_HOST_PTR を使う
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 出力先は1ブロック分だけあればいい
|
||||||
|
// CL_MEM_ALLOC_HOST_PTRを使えばpinned memoryになるらしい
|
||||||
|
data_size = unit_size;
|
||||||
|
if (OpenCL_method & 8)
|
||||||
|
data_size *= 2; // 2ブロックずつ計算できるように、2倍確保しておく
|
||||||
|
OpenCL_dst = gfn_clCreateBuffer(OpenCL_context, CL_MEM_ALLOC_HOST_PTR, data_size, NULL, &ret);
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
return (ret << 8) | 13;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("dst buf : %zd KB (%zd Bytes), OK\n", data_size >> 10, data_size);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// factor は最大個数分 (src_max個)
|
||||||
|
data_size = sizeof(unsigned short) * (*src_max);
|
||||||
|
if (OpenCL_method & 8)
|
||||||
|
data_size *= 2; // 2ブロックずつ計算できるように、2倍確保しておく
|
||||||
|
OpenCL_buf = gfn_clCreateBuffer(OpenCL_context, CL_MEM_READ_ONLY, data_size, NULL, &ret);
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
return (ret << 8) | 14;
|
||||||
|
#ifdef DEBUG_OUTPUT
|
||||||
|
printf("factor buf : %zd Bytes (%d factors), OK\n", data_size, (*src_max));
|
||||||
|
#endif
|
||||||
|
|
||||||
// カーネル引数を指定する
|
// カーネル引数を指定する
|
||||||
ret = gfn_clSetKernelArg(OpenCL_kernel, 1, sizeof(cl_mem), &OpenCL_dst);
|
ret = gfn_clSetKernelArg(OpenCL_kernel, 1, sizeof(cl_mem), &OpenCL_dst);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
@@ -557,13 +756,12 @@ int init_OpenCL(int unit_size, int chunk_size, int *src_max)
|
|||||||
ret = gfn_clSetKernelArg(OpenCL_kernel, 2, sizeof(cl_mem), &OpenCL_buf);
|
ret = gfn_clSetKernelArg(OpenCL_kernel, 2, sizeof(cl_mem), &OpenCL_buf);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 102;
|
return (ret << 8) | 102;
|
||||||
if (ret != CL_SUCCESS)
|
|
||||||
return (ret << 8) | 103;
|
|
||||||
|
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
// ワークアイテム数
|
// ワークアイテム数
|
||||||
printf("\nMax number of work items = %zd (256 * %zd)\n", OpenCL_group_num * 256, OpenCL_group_num);
|
printf("\nMax number of work items = %zd (256 * %zd)\n", OpenCL_group_num * 256, OpenCL_group_num);
|
||||||
#endif
|
#endif
|
||||||
|
OpenCL_method &= 0xFF; // 最後に選択設定を消去する
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -675,16 +873,24 @@ void info_OpenCL(char *buf, int buf_size)
|
|||||||
// ソース・ブロックをデバイス側にコピーする
|
// ソース・ブロックをデバイス側にコピーする
|
||||||
int gpu_copy_blocks(
|
int gpu_copy_blocks(
|
||||||
unsigned char *data, // ブロックのバッファー (境界は 4096にすること)
|
unsigned char *data, // ブロックのバッファー (境界は 4096にすること)
|
||||||
int unit_size, // 4096の倍数にすること
|
unsigned int unit_size, // 4096の倍数にすること
|
||||||
int src_num) // 何ブロックをコピーするのか
|
int src_num) // 何ブロックをコピーするのか
|
||||||
{
|
{
|
||||||
size_t data_size;
|
size_t data_size;
|
||||||
cl_int ret;
|
cl_int ret;
|
||||||
|
cl_mem_flags flags;
|
||||||
|
|
||||||
// Integrated GPU と Discrete GPU の違いに関係なく、使う分だけ毎回メモリー領域を確保する
|
// Integrated GPU と Discrete GPU の違いに関係なく、使う分だけ毎回メモリー領域を確保する
|
||||||
data_size = (size_t)unit_size * src_num;
|
data_size = (size_t)unit_size * src_num;
|
||||||
// Intel GPUならZeroCopyできる、GeForce GPUでもメモリー消費量が少なくてコピーが速い
|
if (OpenCL_method & 32){ // AMD's APU や Integrated GPU なら ZeroCopy する
|
||||||
OpenCL_src = gfn_clCreateBuffer(OpenCL_context, CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR, data_size, data, &ret);
|
// 実際に比較してみると GeForce GPU でもメモリー消費量が少なくてコピーが速い
|
||||||
|
// NVIDIA GPU は CL_MEM_USE_HOST_PTR でも VRAM 上にキャッシュするので速いらしい
|
||||||
|
flags = CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR;
|
||||||
|
} else { // Discrete GPU ならデータを VRAM にコピーする
|
||||||
|
// AMD GPU は明示的にコピーするよう指定しないといけない
|
||||||
|
flags = CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR;
|
||||||
|
}
|
||||||
|
OpenCL_src = gfn_clCreateBuffer(OpenCL_context, flags, data_size, data, &ret);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 1;
|
return (ret << 8) | 1;
|
||||||
#ifdef DEBUG_OUTPUT
|
#ifdef DEBUG_OUTPUT
|
||||||
@@ -700,62 +906,67 @@ int gpu_copy_blocks(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ソース・ブロックを掛け算する
|
// ソース・ブロックを掛け算する
|
||||||
int gpu_multiply_chunks(
|
int gpu_multiply_blocks(
|
||||||
int src_num, // Number of multiplying source blocks
|
int src_num, // Number of multiplying source blocks
|
||||||
unsigned short *mat, // Matrix of numbers to multiply by
|
unsigned short *mat, // Matrix of numbers to multiply by
|
||||||
|
unsigned short *mat2, // Set to calculate 2 blocks at once
|
||||||
unsigned char *buf, // Products go here
|
unsigned char *buf, // Products go here
|
||||||
int offset, // Offset in each block
|
unsigned int len) // Byte length
|
||||||
int length) // Byte length
|
|
||||||
{
|
{
|
||||||
unsigned __int64 *vram, *src, *dst;
|
unsigned __int64 *vram, *src, *dst;
|
||||||
size_t global_size, local_size;
|
size_t global_size, local_size;
|
||||||
cl_int ret;
|
cl_int ret;
|
||||||
|
|
||||||
// 倍率の配列をデバイス側に書き込む
|
// 倍率の配列をデバイス側に書き込む
|
||||||
ret = gfn_clEnqueueWriteBuffer(OpenCL_command, OpenCL_buf, CL_FALSE, 0, sizeof(short) * src_num, mat, 0, NULL, NULL);
|
if (mat2 == NULL){ // 1ブロック分だけコピーする
|
||||||
|
ret = gfn_clEnqueueWriteBuffer(OpenCL_command, OpenCL_buf, CL_FALSE, 0, sizeof(short) * src_num, mat, 0, NULL, NULL);
|
||||||
|
} else { // 2ブロックずつ計算する場合は、配列のサイズも2倍になる
|
||||||
|
if ((size_t)mat2 == 1){ // アドレスが 1 になることはあり得ないので、識別できる
|
||||||
|
ret = gfn_clEnqueueWriteBuffer(OpenCL_command, OpenCL_buf, CL_FALSE, 0, sizeof(short) * src_num * 2, mat, 0, NULL, NULL);
|
||||||
|
} else { // 2回コピーする
|
||||||
|
size_t data_size = sizeof(short) * src_num;
|
||||||
|
ret = gfn_clEnqueueWriteBuffer(OpenCL_command, OpenCL_buf, CL_FALSE, 0, data_size, mat, 0, NULL, NULL);
|
||||||
|
if (ret != CL_SUCCESS)
|
||||||
|
return (ret << 8) | 10;
|
||||||
|
// もう一つの配列は違う場所からコピーする
|
||||||
|
ret = gfn_clEnqueueWriteBuffer(OpenCL_command, OpenCL_buf, CL_FALSE, data_size, data_size, mat2, 0, NULL, NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 10;
|
return (ret << 8) | 11;
|
||||||
|
|
||||||
// 引数を指定する
|
// 引数を指定する
|
||||||
ret = gfn_clSetKernelArg(OpenCL_kernel, 3, sizeof(int), &src_num);
|
ret = gfn_clSetKernelArg(OpenCL_kernel, 3, sizeof(int), &src_num);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 103;
|
return (ret << 8) | 103;
|
||||||
offset /= 4; // 4バイト整数単位にする
|
|
||||||
ret = gfn_clSetKernelArg(OpenCL_kernel, 4, sizeof(int), &offset);
|
|
||||||
if (ret != CL_SUCCESS)
|
|
||||||
return (ret << 8) | 104;
|
|
||||||
length /= 4; // 4バイト整数単位にする
|
|
||||||
ret = gfn_clSetKernelArg(OpenCL_kernel, 5, sizeof(int), &length);
|
|
||||||
if (ret != CL_SUCCESS)
|
|
||||||
return (ret << 8) | 105;
|
|
||||||
|
|
||||||
// カーネル並列実行
|
// カーネル並列実行
|
||||||
local_size = 256; // テーブルやキャッシュのため、work item 数は 256に固定する
|
local_size = 256; // テーブルやキャッシュのため、work item 数は 256 に固定する
|
||||||
global_size = OpenCL_group_num * 256;
|
global_size = OpenCL_group_num * 256;
|
||||||
//printf("group num = %d, global size = %d, local size = 256 \n", OpenCL_group_num, global_size);
|
//printf("group num = %d, global size = %d, local size = %d \n", OpenCL_group_num, global_size, local_size);
|
||||||
ret = gfn_clEnqueueNDRangeKernel(OpenCL_command, OpenCL_kernel, 1, NULL, &global_size, &local_size, 0, NULL, NULL);
|
ret = gfn_clEnqueueNDRangeKernel(OpenCL_command, OpenCL_kernel, 1, NULL, &global_size, &local_size, 0, NULL, NULL);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 11;
|
return (ret << 8) | 12;
|
||||||
|
|
||||||
// 出力内容をホスト側に反映させる
|
// 出力内容をホスト側に反映させる
|
||||||
vram = gfn_clEnqueueMapBuffer(OpenCL_command, OpenCL_dst, CL_TRUE, CL_MAP_READ, 0, length * 4, 0, NULL, NULL, &ret);
|
vram = gfn_clEnqueueMapBuffer(OpenCL_command, OpenCL_dst, CL_TRUE, CL_MAP_READ, 0, len, 0, NULL, NULL, &ret);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 12;
|
return (ret << 8) | 13;
|
||||||
|
|
||||||
// 8バイトごとに XOR する (SSE2 で XOR しても速くならず)
|
// 8バイトごとに XOR する (SSE2 で XOR しても速くならず)
|
||||||
src = vram;
|
src = vram;
|
||||||
dst = (unsigned __int64 *)buf;
|
dst = (unsigned __int64 *)buf;
|
||||||
while (length > 0){
|
while (len > 0){
|
||||||
*dst ^= *src;
|
*dst ^= *src;
|
||||||
dst++;
|
dst++;
|
||||||
src++;
|
src++;
|
||||||
length -= 2;
|
len -= 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ホスト側でデータを変更しなくても、clEnqueueMapBufferと対で呼び出さないといけない
|
// ホスト側でデータを変更しなくても、clEnqueueMapBufferと対で呼び出さないといけない
|
||||||
ret = gfn_clEnqueueUnmapMemObject(OpenCL_command, OpenCL_dst, vram, 0, NULL, NULL);
|
ret = gfn_clEnqueueUnmapMemObject(OpenCL_command, OpenCL_dst, vram, 0, NULL, NULL);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 13;
|
return (ret << 8) | 14;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -768,12 +979,12 @@ int gpu_finish(void)
|
|||||||
// 全ての処理が終わるのを待つ
|
// 全ての処理が終わるのを待つ
|
||||||
ret = gfn_clFinish(OpenCL_command);
|
ret = gfn_clFinish(OpenCL_command);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 20;
|
return (ret << 8) | 30;
|
||||||
|
|
||||||
if (OpenCL_src != NULL){ // 確保されてる場合は解除する
|
if (OpenCL_src != NULL){ // 確保されてる場合は解除する
|
||||||
ret = gfn_clReleaseMemObject(OpenCL_src);
|
ret = gfn_clReleaseMemObject(OpenCL_src);
|
||||||
if (ret != CL_SUCCESS)
|
if (ret != CL_SUCCESS)
|
||||||
return (ret << 8) | 21;
|
return (ret << 8) | 31;
|
||||||
OpenCL_src = NULL;
|
OpenCL_src = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,21 +10,21 @@ extern "C" {
|
|||||||
|
|
||||||
extern int OpenCL_method;
|
extern int OpenCL_method;
|
||||||
|
|
||||||
int init_OpenCL(int unit_size, int chunk_size, int *src_max);
|
int init_OpenCL(unsigned int unit_size, int *src_max);
|
||||||
int free_OpenCL(void);
|
int free_OpenCL(void);
|
||||||
void info_OpenCL(char *buf, int buf_size);
|
void info_OpenCL(char *buf, int buf_size);
|
||||||
|
|
||||||
int gpu_copy_blocks(
|
int gpu_copy_blocks(
|
||||||
unsigned char *data,
|
unsigned char *data,
|
||||||
int unit_size,
|
unsigned int unit_size,
|
||||||
int src_num);
|
int src_num);
|
||||||
|
|
||||||
int gpu_multiply_chunks(
|
int gpu_multiply_blocks(
|
||||||
int src_num, // Number of multiplying source blocks
|
int src_num, // Number of multiplying source blocks
|
||||||
unsigned short *mat, // Matrix of numbers to multiply by
|
unsigned short *mat, // Matrix of numbers to multiply by
|
||||||
|
unsigned short *mat2, // Set to calculate 2 blocks at once
|
||||||
unsigned char *buf, // Products go here
|
unsigned char *buf, // Products go here
|
||||||
int offset, // Offset in each block
|
unsigned int len); // Byte length
|
||||||
int length); // Byte length
|
|
||||||
|
|
||||||
int gpu_finish(void);
|
int gpu_finish(void);
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// list.c
|
// list.c
|
||||||
// Copyright : 2022-10-14 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
@@ -26,6 +26,11 @@
|
|||||||
|
|
||||||
//#define TIMER // 実験用
|
//#define TIMER // 実験用
|
||||||
|
|
||||||
|
#ifdef TIMER
|
||||||
|
#include <time.h>
|
||||||
|
static double time_sec, time_speed;
|
||||||
|
#endif
|
||||||
|
|
||||||
// recovery set のファイルのハッシュ値を調べる (空のファイルは除く)
|
// recovery set のファイルのハッシュ値を調べる (空のファイルは除く)
|
||||||
// 0x00 = ファイルが存在して完全である
|
// 0x00 = ファイルが存在して完全である
|
||||||
// 0x01 = ファイルが存在しない
|
// 0x01 = ファイルが存在しない
|
||||||
@@ -296,7 +301,7 @@ int check_file_complete(
|
|||||||
{
|
{
|
||||||
int i, rv;
|
int i, rv;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
printf("\nVerifying Input File :\n");
|
printf("\nVerifying Input File :\n");
|
||||||
@@ -332,14 +337,14 @@ unsigned int time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("\n hash %d.%03d sec", time_start / 1000, time_start % 1000);
|
time_sec = (double)time_start / CLOCKS_PER_SEC;
|
||||||
if (time_start > 0){
|
if (time_sec > 0){
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_start * 131072));
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
printf(", %d MB/s\n", time_start);
|
|
||||||
} else {
|
} else {
|
||||||
printf("\n");
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
|
printf("\n hash %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -348,7 +353,7 @@ if (time_start > 0){
|
|||||||
// SSD 上で複数ファイルを同時に検査する
|
// SSD 上で複数ファイルを同時に検査する
|
||||||
|
|
||||||
// MAX_MULTI_READ の2倍ぐらいにする?
|
// MAX_MULTI_READ の2倍ぐらいにする?
|
||||||
#define MAX_READ_NUM 10
|
#define MAX_READ_NUM 12
|
||||||
|
|
||||||
int check_file_complete_multi(
|
int check_file_complete_multi(
|
||||||
char *ascii_buf,
|
char *ascii_buf,
|
||||||
@@ -364,17 +369,15 @@ int check_file_complete_multi(
|
|||||||
HANDLE hSub[MAX_READ_NUM];
|
HANDLE hSub[MAX_READ_NUM];
|
||||||
FILE_CHECK_TH th[MAX_READ_NUM];
|
FILE_CHECK_TH th[MAX_READ_NUM];
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_start = GetTickCount();
|
clock_t time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
memset(hSub, 0, sizeof(HANDLE) * MAX_READ_NUM);
|
memset(hSub, 0, sizeof(HANDLE) * MAX_READ_NUM);
|
||||||
// Core数に応じてスレッド数を増やす
|
// Core数に応じてスレッド数を増やす
|
||||||
if ((memory_use & 32) != 0){ // NVMe SSD
|
if ((memory_use & 32) != 0){ // NVMe SSD
|
||||||
if (cpu_num >= 8){ // 8 ~ 16 Cores
|
multi_read = (cpu_num + 2) / 3 + 1; // 3=2, 4~6=3, 7~9=4, 10~12=5, 13~=6
|
||||||
multi_read = 4;
|
if (multi_read > MAX_READ_NUM / 2)
|
||||||
} else { // 3 Cores + Hyper-threading, or 4 ~ 7 Cores
|
multi_read = MAX_READ_NUM / 2;
|
||||||
multi_read = 3;
|
|
||||||
}
|
|
||||||
} else { // SATA SSD
|
} else { // SATA SSD
|
||||||
multi_read = 2;
|
multi_read = 2;
|
||||||
}
|
}
|
||||||
@@ -632,14 +635,14 @@ unsigned int time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount() - time_start;
|
time_start = clock() - time_start;
|
||||||
printf("\n hash %d.%03d sec", time_start / 1000, time_start % 1000);
|
time_sec = (double)time_start / CLOCKS_PER_SEC;
|
||||||
if (time_start > 0){
|
if (time_sec > 0){
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_start * 131072));
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
printf(", %d MB/s\n", time_start);
|
|
||||||
} else {
|
} else {
|
||||||
printf("\n");
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
|
printf("\n hash %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
error_end:
|
error_end:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// md5_crc.c
|
// md5_crc.c
|
||||||
// Copyright : 2023-08-28 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -21,7 +21,6 @@
|
|||||||
#include "phmd5.h"
|
#include "phmd5.h"
|
||||||
#include "md5_crc.h"
|
#include "md5_crc.h"
|
||||||
|
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
// バイト配列の MD5 ハッシュ値を求める
|
// バイト配列の MD5 ハッシュ値を求める
|
||||||
@@ -200,10 +199,14 @@ int file_md5_crc32_block(
|
|||||||
//#define TIMER // 実験用
|
//#define TIMER // 実験用
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
static unsigned int time_start, time1_start;
|
#include <time.h>
|
||||||
static unsigned int time_total = 0, time2_total = 0, time3_total = 0;
|
static double time_sec, time_speed;
|
||||||
|
static clock_t time_start, time1_start;
|
||||||
|
static clock_t time_total = 0, time2_total = 0, time3_total = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define MAX_BUF_SIZE 2097152 // ヒープ領域を使う場合の最大サイズ
|
||||||
|
|
||||||
// ファイルのハッシュ値と各スライスのチェックサムを同時に計算する
|
// ファイルのハッシュ値と各スライスのチェックサムを同時に計算する
|
||||||
int file_hash_crc(
|
int file_hash_crc(
|
||||||
wchar_t *file_name, // ハッシュ値を求めるファイル
|
wchar_t *file_name, // ハッシュ値を求めるファイル
|
||||||
@@ -222,7 +225,7 @@ int file_hash_crc(
|
|||||||
HANDLE hFile;
|
HANDLE hFile;
|
||||||
OVERLAPPED ol;
|
OVERLAPPED ol;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time1_start = GetTickCount();
|
time1_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ソース・ファイルを開く
|
// ソース・ファイルを開く
|
||||||
@@ -249,11 +252,11 @@ time1_start = GetTickCount();
|
|||||||
if (file_left < IO_SIZE)
|
if (file_left < IO_SIZE)
|
||||||
read_size = (unsigned int)file_left;
|
read_size = (unsigned int)file_left;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -279,11 +282,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
||||||
file_off += IO_SIZE;
|
file_off += IO_SIZE;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -299,7 +302,7 @@ time2_total += GetTickCount() - time_start;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = 0; // チェックサム計算
|
off = 0; // チェックサム計算
|
||||||
if (block_left > 0){ // 前回足りなかった分を追加する
|
if (block_left > 0){ // 前回足りなかった分を追加する
|
||||||
@@ -336,7 +339,7 @@ time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time3_total += GetTickCount() - time_start;
|
time3_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 経過表示
|
// 経過表示
|
||||||
@@ -367,16 +370,17 @@ error_end:
|
|||||||
CloseHandle(ol.hEvent);
|
CloseHandle(ol.hEvent);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_total += GetTickCount() - time1_start;
|
time_total += clock() - time1_start;
|
||||||
if (*prog_now == total_file_size){
|
if (*prog_now == total_file_size){
|
||||||
printf("\nread %d.%03d sec\n", time2_total / 1000, time2_total % 1000);
|
printf("\nread %.3f sec\n", (double)time2_total / CLOCKS_PER_SEC);
|
||||||
printf("main %d.%03d sec\n", time3_total / 1000, time3_total % 1000);
|
printf("main %.3f sec\n", (double)time3_total / CLOCKS_PER_SEC);
|
||||||
if (time_total > 0){
|
time_sec = (double)time_total / CLOCKS_PER_SEC;
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_total * 131072));
|
if (time_sec > 0){
|
||||||
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
} else {
|
} else {
|
||||||
time_start = 0;
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
printf("total %d.%03d sec, %d MB/s\n", time_total / 1000, time_total % 1000, time_start);
|
printf("total %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return err;
|
return err;
|
||||||
@@ -401,7 +405,7 @@ int file_hash_crc(
|
|||||||
HANDLE hFile;
|
HANDLE hFile;
|
||||||
OVERLAPPED ol;
|
OVERLAPPED ol;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time1_start = GetTickCount();
|
time1_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ソース・ファイルを開く
|
// ソース・ファイルを開く
|
||||||
@@ -440,11 +444,11 @@ error_retry_read:
|
|||||||
if (file_left < IO_SIZE)
|
if (file_left < IO_SIZE)
|
||||||
read_size = (unsigned int)file_left;
|
read_size = (unsigned int)file_left;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -534,11 +538,11 @@ error_retry_pause:
|
|||||||
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
||||||
file_off += IO_SIZE;
|
file_off += IO_SIZE;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -555,7 +559,7 @@ time2_total += GetTickCount() - time_start;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = 0; // チェックサム計算
|
off = 0; // チェックサム計算
|
||||||
if (block_left > 0){ // 前回足りなかった分を追加する
|
if (block_left > 0){ // 前回足りなかった分を追加する
|
||||||
@@ -592,7 +596,7 @@ time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time3_total += GetTickCount() - time_start;
|
time3_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 経過表示
|
// 経過表示
|
||||||
@@ -623,16 +627,17 @@ error_end:
|
|||||||
CloseHandle(ol.hEvent);
|
CloseHandle(ol.hEvent);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_total += GetTickCount() - time1_start;
|
time_total += clock() - time1_start;
|
||||||
if (*prog_now == total_file_size){
|
if (*prog_now == total_file_size){
|
||||||
printf("\nread %d.%03d sec\n", time2_total / 1000, time2_total % 1000);
|
printf("\nread %.3f sec\n", (double)time2_total / CLOCKS_PER_SEC);
|
||||||
printf("main %d.%03d sec\n", time3_total / 1000, time3_total % 1000);
|
printf("main %.3f sec\n", (double)time3_total / CLOCKS_PER_SEC);
|
||||||
if (time_total > 0){
|
time_sec = (double)time_total / CLOCKS_PER_SEC;
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_total * 131072));
|
if (time_sec > 0){
|
||||||
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
} else {
|
} else {
|
||||||
time_start = 0;
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
printf("total %d.%03d sec, %d MB/s\n", time_total / 1000, time_total % 1000, time_start);
|
printf("total %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return err;
|
return err;
|
||||||
@@ -658,7 +663,7 @@ int file_hash_crc(
|
|||||||
HANDLE hFile;
|
HANDLE hFile;
|
||||||
OVERLAPPED ol;
|
OVERLAPPED ol;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time1_start = GetTickCount();
|
time1_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ソース・ファイルを開く
|
// ソース・ファイルを開く
|
||||||
@@ -671,8 +676,8 @@ time1_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
|
|
||||||
// バッファー・サイズが大きいのでヒープ領域を使う
|
// バッファー・サイズが大きいのでヒープ領域を使う
|
||||||
for (io_size = IO_SIZE; io_size < 1048576; io_size += IO_SIZE){ // 1 MB までにする
|
for (io_size = IO_SIZE; io_size <= MAX_BUF_SIZE; io_size += IO_SIZE){ // IO_SIZE の倍数にする
|
||||||
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFE0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_left))
|
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFF0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_left))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
buf1 = _aligned_malloc(io_size * 2, 64);
|
buf1 = _aligned_malloc(io_size * 2, 64);
|
||||||
@@ -697,11 +702,11 @@ time1_start = GetTickCount();
|
|||||||
if (file_left < io_size)
|
if (file_left < io_size)
|
||||||
read_size = (unsigned int)file_left;
|
read_size = (unsigned int)file_left;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -727,11 +732,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
||||||
file_off += io_size;
|
file_off += io_size;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -747,7 +752,7 @@ time2_total += GetTickCount() - time_start;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = 0; // チェックサム計算
|
off = 0; // チェックサム計算
|
||||||
if (block_left > 0){ // 前回足りなかった分を追加する
|
if (block_left > 0){ // 前回足りなかった分を追加する
|
||||||
@@ -784,7 +789,7 @@ time_start = GetTickCount();
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time3_total += GetTickCount() - time_start;
|
time3_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 経過表示
|
// 経過表示
|
||||||
@@ -817,16 +822,17 @@ error_end:
|
|||||||
_aligned_free(buf1);
|
_aligned_free(buf1);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_total += GetTickCount() - time1_start;
|
time_total += clock() - time1_start;
|
||||||
if (*prog_now == total_file_size){
|
if (*prog_now == total_file_size){
|
||||||
printf("\nread %d.%03d sec\n", time2_total / 1000, time2_total % 1000);
|
printf("\nread %.3f sec\n", (double)time2_total / CLOCKS_PER_SEC);
|
||||||
printf("main %d.%03d sec\n", time3_total / 1000, time3_total % 1000);
|
printf("main %.3f sec\n", (double)time3_total / CLOCKS_PER_SEC);
|
||||||
if (time_total > 0){
|
time_sec = (double)time_total / CLOCKS_PER_SEC;
|
||||||
time_start = (int)((total_file_size * 125) / ((__int64)time_total * 131072));
|
if (time_sec > 0){
|
||||||
|
time_speed = (double)total_file_size / (time_sec * 1048576);
|
||||||
} else {
|
} else {
|
||||||
time_start = 0;
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
printf("total %d.%03d sec, %d MB/s\n", time_total / 1000, time_total % 1000, time_start);
|
printf("total %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return err;
|
return err;
|
||||||
@@ -866,8 +872,8 @@ DWORD WINAPI file_hash_crc2(LPVOID lpParameter)
|
|||||||
|
|
||||||
// バッファー・サイズが大きいのでヒープ領域を使う
|
// バッファー・サイズが大きいのでヒープ領域を使う
|
||||||
prog_tick = 1;
|
prog_tick = 1;
|
||||||
for (io_size = IO_SIZE; io_size < 1048576; io_size += IO_SIZE){ // IO_SIZE の倍数で 1 MB までにする
|
for (io_size = IO_SIZE; io_size <= MAX_BUF_SIZE; io_size += IO_SIZE){ // IO_SIZE の倍数にする
|
||||||
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFE0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_left))
|
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFF0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_left))
|
||||||
break;
|
break;
|
||||||
prog_tick++;
|
prog_tick++;
|
||||||
}
|
}
|
||||||
@@ -1036,7 +1042,7 @@ int file_hash_check(
|
|||||||
PHMD5 hash_ctx, block_ctx;
|
PHMD5 hash_ctx, block_ctx;
|
||||||
OVERLAPPED ol;
|
OVERLAPPED ol;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time1_start = GetTickCount();
|
time1_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
prog_last = -1; // 検証中のファイル名を毎回表示する
|
prog_last = -1; // 検証中のファイル名を毎回表示する
|
||||||
@@ -1060,11 +1066,11 @@ time1_start = GetTickCount();
|
|||||||
file_left = file_size - 16384; // 本来のファイル・サイズまでしか検査しない
|
file_left = file_size - 16384; // 本来のファイル・サイズまでしか検査しない
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, len, NULL, &ol);
|
off = ReadFile(hFile, buf, len, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -1139,11 +1145,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
if (file_left < IO_SIZE)
|
if (file_left < IO_SIZE)
|
||||||
read_size = (unsigned int)file_left;
|
read_size = (unsigned int)file_left;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -1166,11 +1172,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
||||||
file_off += IO_SIZE;
|
file_off += IO_SIZE;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -1185,7 +1191,7 @@ time2_total += GetTickCount() - time_start;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
if (s_blk != NULL){
|
if (s_blk != NULL){
|
||||||
off = 0;
|
off = 0;
|
||||||
@@ -1228,7 +1234,7 @@ time_start = GetTickCount();
|
|||||||
Phmd5Process(&hash_ctx, buf, len); // MD5 計算
|
Phmd5Process(&hash_ctx, buf, len); // MD5 計算
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time3_total += GetTickCount() - time_start;
|
time3_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 経過表示
|
// 経過表示
|
||||||
@@ -1265,15 +1271,16 @@ error_end:
|
|||||||
CloseHandle(ol.hEvent);
|
CloseHandle(ol.hEvent);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_total += GetTickCount() - time1_start;
|
time_total += clock() - time1_start;
|
||||||
printf("\nread %d.%03d sec\n", time2_total / 1000, time2_total % 1000);
|
printf("\nread %.3f sec\n", (double)time2_total / CLOCKS_PER_SEC);
|
||||||
printf("main %d.%03d sec\n", time3_total / 1000, time3_total % 1000);
|
printf("main %.3f sec\n", (double)time3_total / CLOCKS_PER_SEC);
|
||||||
if (time_total > 0){
|
time_sec = (double)time_total / CLOCKS_PER_SEC;
|
||||||
time_start = (int)((file_size * 125) / ((__int64)time_total * 131072));
|
if (time_sec > 0){
|
||||||
|
time_speed = (double)file_size / (time_sec * 1048576);
|
||||||
} else {
|
} else {
|
||||||
time_start = 0;
|
time_speed = 0;
|
||||||
}
|
}
|
||||||
printf("total %d.%03d sec, %d MB/s\n", time_total / 1000, time_total % 1000, time_start);
|
printf("total %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
return comp_num;
|
return comp_num;
|
||||||
}
|
}
|
||||||
@@ -1303,8 +1310,8 @@ DWORD WINAPI file_hash_background(LPVOID lpParameter)
|
|||||||
find_next = files[num].b_off; // 先頭ブロックの番号
|
find_next = files[num].b_off; // 先頭ブロックの番号
|
||||||
|
|
||||||
// バッファー・サイズが大きいのでヒープ領域を使う
|
// バッファー・サイズが大きいのでヒープ領域を使う
|
||||||
for (io_size = IO_SIZE; io_size < 1048576; io_size += IO_SIZE){ // IO_SIZE の倍数で 1 MB までにする
|
for (io_size = IO_SIZE; io_size <= MAX_BUF_SIZE; io_size += IO_SIZE){ // IO_SIZE の倍数にする
|
||||||
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFE0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_size))
|
if ((io_size + IO_SIZE > (cpu_cache & 0xFFFF0000)) || ((__int64)(io_size + IO_SIZE) * 4 > file_size))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
//printf("\n io_size = %d\n", io_size);
|
//printf("\n io_size = %d\n", io_size);
|
||||||
@@ -1534,7 +1541,7 @@ int file_hash_direct(
|
|||||||
HANDLE hFile;
|
HANDLE hFile;
|
||||||
OVERLAPPED ol;
|
OVERLAPPED ol;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time1_start = GetTickCount();
|
time1_start = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
prog_last = -1; // 検証中のファイル名を毎回表示する
|
prog_last = -1; // 検証中のファイル名を毎回表示する
|
||||||
@@ -1590,11 +1597,11 @@ time1_start = GetTickCount();
|
|||||||
file_left = file_size - 16384; // 本来のファイル・サイズまでしか検査しない
|
file_left = file_size - 16384; // 本来のファイル・サイズまでしか検査しない
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
comp_num = -1;
|
comp_num = -1;
|
||||||
@@ -1677,11 +1684,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
read_size = (read_size + 4095) & ~4095; // 4KB の倍数にする
|
read_size = (read_size + 4095) & ~4095; // 4KB の倍数にする
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf1, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -1708,11 +1715,11 @@ time2_total += GetTickCount() - time_start;
|
|||||||
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
ol.OffsetHigh = (unsigned int)(file_off >> 32);
|
||||||
file_off += IO_SIZE;
|
file_off += IO_SIZE;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
off = ReadFile(hFile, buf, read_size, NULL, &ol);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time2_total += GetTickCount() - time_start;
|
time2_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
if ((off == 0) && (GetLastError() != ERROR_IO_PENDING)){
|
||||||
print_win32_err();
|
print_win32_err();
|
||||||
@@ -1727,7 +1734,7 @@ time2_total += GetTickCount() - time_start;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_start = GetTickCount();
|
time_start = clock();
|
||||||
#endif
|
#endif
|
||||||
if (s_blk != NULL){
|
if (s_blk != NULL){
|
||||||
off = 0;
|
off = 0;
|
||||||
@@ -1769,7 +1776,7 @@ time_start = GetTickCount();
|
|||||||
Phmd5Process(&hash_ctx, buf, len); // MD5 計算
|
Phmd5Process(&hash_ctx, buf, len); // MD5 計算
|
||||||
}
|
}
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time3_total += GetTickCount() - time_start;
|
time3_total += clock() - time_start;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// 経過表示
|
// 経過表示
|
||||||
@@ -1810,10 +1817,16 @@ error_end:
|
|||||||
_aligned_free(buf1);
|
_aligned_free(buf1);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_total += GetTickCount() - time1_start;
|
time_total += clock() - time1_start;
|
||||||
printf("\nread %d.%03d sec\n", time2_total / 1000, time2_total % 1000);
|
printf("\nread %.3f sec\n", (double)time2_total / CLOCKS_PER_SEC);
|
||||||
printf("main %d.%03d sec\n", time3_total / 1000, time3_total % 1000);
|
printf("main %.3f sec\n", (double)time3_total / CLOCKS_PER_SEC);
|
||||||
printf("total %d.%03d sec\n", time_total / 1000, time_total % 1000);
|
time_sec = (double)time_total / CLOCKS_PER_SEC;
|
||||||
|
if (time_sec > 0){
|
||||||
|
time_speed = (double)file_size / (time_sec * 1048576);
|
||||||
|
} else {
|
||||||
|
time_speed = 0;
|
||||||
|
}
|
||||||
|
printf("total %.3f sec, %.0f MB/s\n", time_sec, time_speed);
|
||||||
#endif
|
#endif
|
||||||
return comp_num;
|
return comp_num;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// par2.c
|
// par2.c
|
||||||
// Copyright : 2023-09-21 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
@@ -181,7 +181,7 @@ int par2_create(
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 共通パケットを作成する
|
// 共通パケットを作成する
|
||||||
if ((memory_use & 16) && (cpu_num >= 4) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
if ((memory_use & 16) && (cpu_num >= 3) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
||||||
common_size = set_common_packet_multi(common_buf, &packet_num, (switch_p & 2) >> 1, files);
|
common_size = set_common_packet_multi(common_buf, &packet_num, (switch_p & 2) >> 1, files);
|
||||||
} else {
|
} else {
|
||||||
common_size = set_common_packet(common_buf, &packet_num, (switch_p & 2) >> 1, files);
|
common_size = set_common_packet(common_buf, &packet_num, (switch_p & 2) >> 1, files);
|
||||||
@@ -529,7 +529,7 @@ int par2_verify(
|
|||||||
|
|
||||||
// ソース・ファイルが完全かどうかを調べる
|
// ソース・ファイルが完全かどうかを調べる
|
||||||
// ファイルの状態は 完全、消失、追加、破損(完全なブロックの数) の4種類
|
// ファイルの状態は 完全、消失、追加、破損(完全なブロックの数) の4種類
|
||||||
if ((memory_use & 16) && (cpu_num >= 4) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
if ((memory_use & 16) && (cpu_num >= 3) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
||||||
err = check_file_complete_multi(ascii_buf, uni_buf, files, s_blk);
|
err = check_file_complete_multi(ascii_buf, uni_buf, files, s_blk);
|
||||||
} else {
|
} else {
|
||||||
err = check_file_complete(ascii_buf, uni_buf, files, s_blk);
|
err = check_file_complete(ascii_buf, uni_buf, files, s_blk);
|
||||||
@@ -741,7 +741,7 @@ int par2_repair(
|
|||||||
|
|
||||||
// ソース・ファイルが完全かどうかを一覧表示する
|
// ソース・ファイルが完全かどうかを一覧表示する
|
||||||
// ファイルの状態は 完全、消失、追加、破損(完全なブロックの数) の4種類
|
// ファイルの状態は 完全、消失、追加、破損(完全なブロックの数) の4種類
|
||||||
if ((memory_use & 16) && (cpu_num >= 4) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
if ((memory_use & 16) && (cpu_num >= 3) && (entity_num >= 2)){ // SSDなら複数ファイルを同時に処理する
|
||||||
err = check_file_complete_multi(ascii_buf, uni_buf, files, s_blk);
|
err = check_file_complete_multi(ascii_buf, uni_buf, files, s_blk);
|
||||||
} else {
|
} else {
|
||||||
err = check_file_complete(ascii_buf, uni_buf, files, s_blk);
|
err = check_file_complete(ascii_buf, uni_buf, files, s_blk);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// par2_cmd.c
|
// par2_cmd.c
|
||||||
// Copyright : 2023-09-28 Yutaka Sawada
|
// Copyright : 2025-03-12 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
@@ -86,36 +86,38 @@ static void print_environment(void)
|
|||||||
|
|
||||||
printf("CPU thread\t: %d / %d\n", cpu_num & 0xFFFF, cpu_num >> 24);
|
printf("CPU thread\t: %d / %d\n", cpu_num & 0xFFFF, cpu_num >> 24);
|
||||||
cpu_num &= 0xFFFF; // 利用するコア数だけにしておく
|
cpu_num &= 0xFFFF; // 利用するコア数だけにしておく
|
||||||
printf("CPU cache limit : %d KB, %d KB\n", (cpu_flag & 0xFFFF0000) >> 10, (cpu_cache & 0xFFFE0000) >> 10);
|
printf("CPU cache limit : %d KB, %d KB (%d)\n", (cpu_flag & 0xFFFF0000) >> 10, (cpu_cache & 0xFFFF0000) >> 10, cpu_cache & 0xFFFF);
|
||||||
#ifndef _WIN64 // 32-bit 版は MMX, SSE2, SSSE3 のどれかを表示する
|
#ifndef _WIN64 // 32-bit 版は MMX, SSE2, SSSE3, AVX2 のどれかを表示する
|
||||||
printf("CPU extra\t:");
|
printf("CPU extra\t:");
|
||||||
if (cpu_flag & 1){
|
if (((cpu_flag & 16) != 0) && ((cpu_flag & 256) == 0)){
|
||||||
|
printf(" AVX2");
|
||||||
|
} else if (cpu_flag & 1){
|
||||||
if (cpu_flag & 256){
|
if (cpu_flag & 256){
|
||||||
printf(" SSSE3(old)");
|
printf(" SSSE3(slow)");
|
||||||
} else {
|
} else {
|
||||||
printf(" SSSE3");
|
printf(" SSSE3");
|
||||||
}
|
}
|
||||||
} else if (cpu_flag & 128){
|
} else if (((cpu_flag & 128) != 0) && ((cpu_flag & 256) == 0)){
|
||||||
printf(" SSE2");
|
printf(" SSE2");
|
||||||
} else {
|
} else {
|
||||||
printf(" MMX");
|
printf(" MMX");
|
||||||
}
|
}
|
||||||
#else // 64-bit 版は SSE2, SSSE3 を表示する
|
#else // 64-bit 版は SSE2, SSSE3, AVX2 を表示する
|
||||||
printf("CPU extra\t: x64");
|
printf("CPU extra\t: x64");
|
||||||
if (cpu_flag & 1){
|
if (((cpu_flag & 16) != 0) && ((cpu_flag & 256) == 0)){
|
||||||
|
printf(" AVX2");
|
||||||
|
} else if (cpu_flag & 1){
|
||||||
if (cpu_flag & 256){
|
if (cpu_flag & 256){
|
||||||
printf(" SSSE3(old)");
|
printf(" SSSE3(slow)");
|
||||||
} else {
|
} else {
|
||||||
printf(" SSSE3");
|
printf(" SSSE3");
|
||||||
}
|
}
|
||||||
} else if (cpu_flag & 128){
|
} else if (((cpu_flag & 128) != 0) && ((cpu_flag & 256) == 0)){
|
||||||
printf(" SSE2");
|
printf(" SSE2");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (cpu_flag & 8)
|
if (cpu_flag & 8)
|
||||||
printf(" CLMUL");
|
printf(" CLMUL");
|
||||||
if (cpu_flag & 16)
|
|
||||||
printf(" AVX2");
|
|
||||||
printf("\nMemory usage\t: ");
|
printf("\nMemory usage\t: ");
|
||||||
if (memory_use & 7){
|
if (memory_use & 7){
|
||||||
printf("%d/8", memory_use & 7);
|
printf("%d/8", memory_use & 7);
|
||||||
@@ -1446,14 +1448,12 @@ ri= switch_set & 0x00040000
|
|||||||
} else if (wcsncmp(tmp_p, L"lr", 2) == 0){
|
} else if (wcsncmp(tmp_p, L"lr", 2) == 0){
|
||||||
recovery_limit = 0;
|
recovery_limit = 0;
|
||||||
j = 2;
|
j = 2;
|
||||||
while ((j < 2 + 6) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
while ((j < 2 + 10) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
||||||
recovery_limit = (recovery_limit * 10) + (tmp_p[j] - '0');
|
recovery_limit = (recovery_limit * 10) + (tmp_p[j] - '0');
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
if (recovery_limit <= 0) // -lr0 ならソース・ファイルの最大ブロック数と同じにする
|
if (recovery_limit <= 0) // -lr0 ならソース・ファイルの最大ブロック数と同じにする
|
||||||
recovery_limit = -1;
|
recovery_limit = -1;
|
||||||
if (recovery_limit > MAX_PARITY_NUM)
|
|
||||||
recovery_limit = MAX_PARITY_NUM;
|
|
||||||
} else if (wcsncmp(tmp_p, L"ls", 2) == 0){
|
} else if (wcsncmp(tmp_p, L"ls", 2) == 0){
|
||||||
__int64 num8 = 0;
|
__int64 num8 = 0;
|
||||||
j = 2;
|
j = 2;
|
||||||
@@ -1475,50 +1475,77 @@ ri= switch_set & 0x00040000
|
|||||||
switch_v |= j;
|
switch_v |= j;
|
||||||
// 共通のオプション (数値)
|
// 共通のオプション (数値)
|
||||||
} else if (wcsncmp(tmp_p, L"lc", 2) == 0){
|
} else if (wcsncmp(tmp_p, L"lc", 2) == 0){
|
||||||
k = 0;
|
if (tmp_p[2] == 'b'){ // Size of Cache Blocking (CPU's L2 cache optimization)
|
||||||
j = 2;
|
k = 0;
|
||||||
while ((j < 2 + 5) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
j = 3;
|
||||||
k = (k * 10) + (tmp_p[j] - '0');
|
while ((j < 3 + 5) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
||||||
j++;
|
k = (k * 10) + (tmp_p[j] - '0');
|
||||||
}
|
j++;
|
||||||
if (k & 256){ // GPU を使う
|
|
||||||
OpenCL_method = 1; // Faster GPU
|
|
||||||
} else if (k & 512){
|
|
||||||
OpenCL_method = -1; // Slower GPU
|
|
||||||
}
|
|
||||||
if (k & 1024) // CLMUL を使わない、SSSE3 の古いエンコーダーを使う
|
|
||||||
cpu_flag = (cpu_flag & 0xFFFFFFF7) | 0x100;
|
|
||||||
if (k & 2048) // JIT(SSE2) を使わない
|
|
||||||
cpu_flag &= 0xFFFFFF7F;
|
|
||||||
if (k & 4096) // SSSE3 を使わない
|
|
||||||
cpu_flag &= 0xFFFFFFFE;
|
|
||||||
if (k & 8192) // AVX2 を使わない
|
|
||||||
cpu_flag &= 0xFFFFFFEF;
|
|
||||||
if (k & 255){ // 使用するコア数を変更する
|
|
||||||
k &= 255; // 1~255 の範囲
|
|
||||||
// printf("\n lc# = %d , logical = %d, physical = %d \n", k, cpu_num >> 24, (cpu_num & 0x00FF0000) >> 16);
|
|
||||||
if (k == 251){ // 物理コア数の 1/4 にする
|
|
||||||
k = ((cpu_num & 0x00FF0000) >> 16) / 4;
|
|
||||||
} else if (k == 252){ // 物理コア数の半分にする
|
|
||||||
k = ((cpu_num & 0x00FF0000) >> 16) / 2;
|
|
||||||
} else if (k == 253){ // 物理コア数の 3/4 にする
|
|
||||||
k = (((cpu_num & 0x00FF0000) >> 16) * 3) / 4;
|
|
||||||
} else if (k == 254){ // 物理コア数より減らす
|
|
||||||
k = ((cpu_num & 0x00FF0000) >> 16) - 1;
|
|
||||||
} else if (k == 255){ // 物理コア数より増やす
|
|
||||||
k = ((cpu_num & 0x00FF0000) >> 16) + 1;
|
|
||||||
//k = cpu_num >> 16;
|
|
||||||
//k = ((k & 0xFF) + (k >> 8)) / 2; // 物理コア数と論理コア数の中間にする?
|
|
||||||
// タスクマネージャーにおける CPU使用率は 100%になるけど、速くはならない・・・
|
|
||||||
}
|
}
|
||||||
if (k > MAX_CPU){
|
if (k <= 0x7FFF) // 上位 16-bit に上書きする
|
||||||
k = MAX_CPU;
|
cpu_flag = (cpu_flag & 0xFFFF) | (k << 16);
|
||||||
} else if (k < 1){
|
} else if (tmp_p[2] == 's'){ // Size of Shared Cache
|
||||||
k = 1;
|
k = 0;
|
||||||
} else if (k > (cpu_num >> 24)){
|
j = 3;
|
||||||
k = cpu_num >> 24; // 論理コア数を超えないようにする
|
while ((j < 3 + 5) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
||||||
|
k = (k * 10) + (tmp_p[j] - '0');
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
if (k <= 0xFFFF) // 上位 16-bit に上書きする
|
||||||
|
cpu_cache = (cpu_cache & 0xFFFF) | (k << 16);
|
||||||
|
} else if (tmp_p[2] == 'm'){ // Max number of chunks (CPU's shared L3 cache optimization)
|
||||||
|
k = 0;
|
||||||
|
j = 3;
|
||||||
|
while ((j < 3 + 5) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
||||||
|
k = (k * 10) + (tmp_p[j] - '0');
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
if (k <= 0x8000) // CACHE_MIN_NUM 未満なら 0x8000 になる
|
||||||
|
cpu_cache = (cpu_cache & 0xFFFF0000) | k; // 下位 16-bit に上書きする
|
||||||
|
} else { // Extra と GPU も別にしてもいいかも?
|
||||||
|
k = 0;
|
||||||
|
j = 2;
|
||||||
|
while ((j < 2 + 7) && (tmp_p[j] >= '0') && (tmp_p[j] <= '9')){
|
||||||
|
k = (k * 10) + (tmp_p[j] - '0');
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
if (k & 0x300){ // GPU を使う
|
||||||
|
OpenCL_method = k & 0x003F0300;
|
||||||
|
}
|
||||||
|
if (k & 1024) // CLMUL と ALTMAP を使わない
|
||||||
|
cpu_flag = (cpu_flag & 0xFFFFFFF7) | 256;
|
||||||
|
if (k & 2048) // JIT(SSE2) を使わない
|
||||||
|
cpu_flag &= 0xFFFFFF7F;
|
||||||
|
if (k & 4096) // SSSE3 を使わない
|
||||||
|
cpu_flag &= 0xFFFFFFFE;
|
||||||
|
if (k & 8192) // AVX2 を使わない
|
||||||
|
cpu_flag &= 0xFFFFFFEF;
|
||||||
|
if (k & 255){ // 使用するコア数を変更する
|
||||||
|
k &= 255; // 1~255 の範囲
|
||||||
|
// printf("\n lc# = %d , logical = %d, physical = %d \n", k, cpu_num >> 24, (cpu_num & 0x00FF0000) >> 16);
|
||||||
|
if (k == 251){ // 物理コア数の 1/4 にする
|
||||||
|
k = ((cpu_num & 0x00FF0000) >> 16) / 4;
|
||||||
|
} else if (k == 252){ // 物理コア数の半分にする
|
||||||
|
k = ((cpu_num & 0x00FF0000) >> 16) / 2;
|
||||||
|
} else if (k == 253){ // 物理コア数の 3/4 にする
|
||||||
|
k = (((cpu_num & 0x00FF0000) >> 16) * 3) / 4;
|
||||||
|
} else if (k == 254){ // 物理コア数より減らす
|
||||||
|
k = ((cpu_num & 0x00FF0000) >> 16) - 1;
|
||||||
|
} else if (k == 255){ // 物理コア数より増やす
|
||||||
|
k = cpu_num >> 16;
|
||||||
|
k = ((k & 0xFF) + (k >> 8)) / 2; // 物理コア数と論理コア数の中間にする?
|
||||||
|
// タスクマネージャーにおける CPU使用率は 100%になるけど、速くはならない・・・
|
||||||
|
// k = (k & 0xFF) + ((k >> 8) - (k & 0xFF)) / 4; // 物理コア数の 5/4 にする?
|
||||||
|
}
|
||||||
|
if (k > MAX_CPU){
|
||||||
|
k = MAX_CPU;
|
||||||
|
} else if (k < 1){
|
||||||
|
k = 1;
|
||||||
|
} else if (k > (cpu_num >> 24)){
|
||||||
|
k = cpu_num >> 24; // 論理コア数を超えないようにする
|
||||||
|
}
|
||||||
|
cpu_num = (cpu_num & 0xFFFF0000) | k; // 指定されたコア数を下位に配置する
|
||||||
}
|
}
|
||||||
cpu_num = (cpu_num & 0xFFFF0000) | k; // 指定されたコア数を下位に配置する
|
|
||||||
}
|
}
|
||||||
} else if (wcsncmp(tmp_p, L"m", 1) == 0){
|
} else if (wcsncmp(tmp_p, L"m", 1) == 0){
|
||||||
memory_use = 0;
|
memory_use = 0;
|
||||||
@@ -1948,6 +1975,14 @@ fclose(fp);
|
|||||||
if (recovery_limit > j)
|
if (recovery_limit > j)
|
||||||
recovery_limit = j;
|
recovery_limit = j;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if (split_size == 2){ // 制限をブロック数ではなく、サイズとして認識する
|
||||||
|
recovery_limit /= block_size;
|
||||||
|
if (recovery_limit < 1)
|
||||||
|
recovery_limit = 1;
|
||||||
|
}
|
||||||
|
if (recovery_limit > MAX_PARITY_NUM) // パリティ・ブロック数の最大値を超えない
|
||||||
|
recovery_limit = MAX_PARITY_NUM;
|
||||||
}
|
}
|
||||||
// パリティ・ブロックをリカバリ・ファイルに分配する方法
|
// パリティ・ブロックをリカバリ・ファイルに分配する方法
|
||||||
i = (switch_set & 0x30000) >> 16;
|
i = (switch_set & 0x30000) >> 16;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// reedsolomon.c
|
// reedsolomon.c
|
||||||
// Copyright : 2023-09-28 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
@@ -27,6 +27,9 @@
|
|||||||
#include "rs_decode.h"
|
#include "rs_decode.h"
|
||||||
#include "reedsolomon.h"
|
#include "reedsolomon.h"
|
||||||
|
|
||||||
|
#ifdef TIMER
|
||||||
|
#include <time.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
// GPU を使う最小データサイズ (MB 単位)
|
// GPU を使う最小データサイズ (MB 単位)
|
||||||
// GPU の起動には時間がかかるので、データが小さすぎると逆に遅くなる
|
// GPU の起動には時間がかかるので、データが小さすぎると逆に遅くなる
|
||||||
@@ -204,6 +207,48 @@ int read_block_num(
|
|||||||
return buf_num;
|
return buf_num;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 1st encode, decode を何スレッドで実行するか決める
|
||||||
|
int calc_thread_num1(int max_num)
|
||||||
|
{
|
||||||
|
int i, num;
|
||||||
|
|
||||||
|
// 読み込み中はスレッド数を減らす(シングル・スレッドの時は 0にする)
|
||||||
|
num = 0;
|
||||||
|
i = 1;
|
||||||
|
while (i * 2 <= cpu_num){ // 1=0, 2~3=1, 4~7=2, 8~15=3, 16~31=4, 32=5
|
||||||
|
num++;
|
||||||
|
i *= 2;
|
||||||
|
}
|
||||||
|
if (num > max_num)
|
||||||
|
num = max_num;
|
||||||
|
|
||||||
|
return num;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1st & 2nd encode, decode を何スレッドで実行するか決める
|
||||||
|
int calc_thread_num2(int max_num, int *cpu_num2)
|
||||||
|
{
|
||||||
|
int i, num1, num2;
|
||||||
|
|
||||||
|
// 読み込み中はスレッド数を減らす(シングル・スレッドの時は 0にする)
|
||||||
|
num1 = 0;
|
||||||
|
i = 2;
|
||||||
|
while (i <= cpu_num){ // 1=0, 2~3=1, 4~7=2, 8~15=3, 16~31=4, 32=5
|
||||||
|
num1++;
|
||||||
|
i *= 2;
|
||||||
|
}
|
||||||
|
if (num1 > max_num)
|
||||||
|
num1 = max_num;
|
||||||
|
|
||||||
|
// CPU と GPU で必ず2スレッド使う
|
||||||
|
num2 = cpu_num;
|
||||||
|
if (num2 < 2)
|
||||||
|
num2 = 2;
|
||||||
|
*cpu_num2 = num2;
|
||||||
|
|
||||||
|
return num1;
|
||||||
|
}
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
// 戸川 隼人 の「演習と応用FORTRAN77」の逆行列の計算方法を参考にして
|
// 戸川 隼人 の「演習と応用FORTRAN77」の逆行列の計算方法を参考にして
|
||||||
// Gaussian Elimination を少し修正して行列の数を一つにしてみた
|
// Gaussian Elimination を少し修正して行列の数を一つにしてみた
|
||||||
@@ -697,7 +742,7 @@ int rs_encode(
|
|||||||
int err = 0;
|
int err = 0;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_total = GetTickCount();
|
clock_t time_total = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (galois_create_table()){
|
if (galois_create_table()){
|
||||||
@@ -713,7 +758,7 @@ unsigned int time_total = GetTickCount();
|
|||||||
// パリティ計算用の行列演算の準備をする
|
// パリティ計算用の行列演算の準備をする
|
||||||
len = sizeof(unsigned short) * source_num;
|
len = sizeof(unsigned short) * source_num;
|
||||||
if (OpenCL_method != 0)
|
if (OpenCL_method != 0)
|
||||||
len *= 2; // GPU の作業領域も確保しておく
|
len *= 3; // GPU の作業領域も確保しておく
|
||||||
constant = malloc(len);
|
constant = malloc(len);
|
||||||
if (constant == NULL){
|
if (constant == NULL){
|
||||||
printf("malloc, %d\n", len);
|
printf("malloc, %d\n", len);
|
||||||
@@ -757,8 +802,8 @@ unsigned int time_total = GetTickCount();
|
|||||||
err = encode_method2(file_path, header_buf, rcv_hFile, files, s_blk, p_blk, constant);
|
err = encode_method2(file_path, header_buf, rcv_hFile, files, s_blk, p_blk, constant);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
if (err != 1){
|
if (err != 1){
|
||||||
time_total = GetTickCount() - time_total;
|
time_total = clock() - time_total;
|
||||||
printf("total %d.%03d sec\n", time_total / 1000, time_total % 1000);
|
printf("total %.3f sec\n", (double)time_total / CLOCKS_PER_SEC);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -788,7 +833,7 @@ int rs_encode_1pass(
|
|||||||
int err = 0;
|
int err = 0;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_total = GetTickCount();
|
clock_t time_total = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (galois_create_table()){
|
if (galois_create_table()){
|
||||||
@@ -799,7 +844,7 @@ unsigned int time_total = GetTickCount();
|
|||||||
// パリティ計算用の行列演算の準備をする
|
// パリティ計算用の行列演算の準備をする
|
||||||
len = sizeof(unsigned short) * source_num;
|
len = sizeof(unsigned short) * source_num;
|
||||||
if (OpenCL_method != 0)
|
if (OpenCL_method != 0)
|
||||||
len *= 2; // GPU の作業領域も確保しておく
|
len *= 3; // GPU の作業領域も確保しておく
|
||||||
constant = malloc(len);
|
constant = malloc(len);
|
||||||
if (constant == NULL){
|
if (constant == NULL){
|
||||||
printf("malloc, %d\n", len);
|
printf("malloc, %d\n", len);
|
||||||
@@ -846,8 +891,8 @@ unsigned int time_total = GetTickCount();
|
|||||||
if (err < 0){
|
if (err < 0){
|
||||||
printf("switching to 2-pass processing, %d\n", err);
|
printf("switching to 2-pass processing, %d\n", err);
|
||||||
} else if (err != 1){
|
} else if (err != 1){
|
||||||
time_total = GetTickCount() - time_total;
|
time_total = clock() - time_total;
|
||||||
printf("total %d.%03d sec\n", time_total / 1000, time_total % 1000);
|
printf("total %.3f sec\n", (double)time_total / CLOCKS_PER_SEC);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -871,7 +916,7 @@ int rs_decode(
|
|||||||
int err = 0, i, j, k;
|
int err = 0, i, j, k;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
unsigned int time_matrix = 0, time_total = GetTickCount();
|
clock_t time_matrix = 0, time_total = clock();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (galois_create_table()){
|
if (galois_create_table()){
|
||||||
@@ -906,7 +951,7 @@ unsigned int time_matrix = 0, time_total = GetTickCount();
|
|||||||
id = mat + (block_lost * source_num);
|
id = mat + (block_lost * source_num);
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_matrix = GetTickCount();
|
time_matrix = clock();
|
||||||
#endif
|
#endif
|
||||||
// 復元用の行列を計算する
|
// 復元用の行列を計算する
|
||||||
print_progress_text(0, "Computing matrix");
|
print_progress_text(0, "Computing matrix");
|
||||||
@@ -947,7 +992,7 @@ time_matrix = GetTickCount();
|
|||||||
//for (i = 0; i < block_lost; i++)
|
//for (i = 0; i < block_lost; i++)
|
||||||
// printf("id[%d] = %d\n", i, id[i]);
|
// printf("id[%d] = %d\n", i, id[i]);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
time_matrix = GetTickCount() - time_matrix;
|
time_matrix = clock() - time_matrix;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
@@ -960,8 +1005,7 @@ time_matrix = GetTickCount() - time_matrix;
|
|||||||
// ブロック数が多いなら、ブロックごとにスレッドを割り当てる (GPU を使う)
|
// ブロック数が多いなら、ブロックごとにスレッドを割り当てる (GPU を使う)
|
||||||
if (memory_use & 16){
|
if (memory_use & 16){
|
||||||
err = -4; // SSD なら Read all 方式でブロックが断片化しても速い
|
err = -4; // SSD なら Read all 方式でブロックが断片化しても速い
|
||||||
} else
|
} else if (read_block_num(block_lost * 2, 0, MEM_UNIT) != 0){
|
||||||
if (read_block_num(block_lost, 0, MEM_UNIT) != 0){
|
|
||||||
err = -5; // HDD でメモリーが足りてるなら Read some 方式を使う
|
err = -5; // HDD でメモリーが足りてるなら Read some 方式を使う
|
||||||
} else {
|
} else {
|
||||||
err = -4; // メモリー不足なら Read all 方式でブロックを断片化させる
|
err = -4; // メモリー不足なら Read all 方式でブロックを断片化させる
|
||||||
@@ -970,8 +1014,7 @@ time_matrix = GetTickCount() - time_matrix;
|
|||||||
// ソース・ブロックを全て断片的に読み込むか、いくつかを丸ごと読み込むかを決める
|
// ソース・ブロックを全て断片的に読み込むか、いくつかを丸ごと読み込むかを決める
|
||||||
if (memory_use & 16){
|
if (memory_use & 16){
|
||||||
err = -2; // SSD なら Read all 方式でブロックが断片化しても速い
|
err = -2; // SSD なら Read all 方式でブロックが断片化しても速い
|
||||||
} else
|
} else if (read_block_num(block_lost, 0, sse_unit) != 0){
|
||||||
if (read_block_num(block_lost, 0, sse_unit) != 0){
|
|
||||||
err = -3; // HDD でメモリーが足りてるなら Read some 方式を使う
|
err = -3; // HDD でメモリーが足りてるなら Read some 方式を使う
|
||||||
} else {
|
} else {
|
||||||
err = -2; // メモリー不足なら Read all 方式でブロックを断片化させる
|
err = -2; // メモリー不足なら Read all 方式でブロックを断片化させる
|
||||||
@@ -992,9 +1035,9 @@ time_matrix = GetTickCount() - time_matrix;
|
|||||||
err = decode_method2(file_path, block_lost, rcv_hFile, files, s_blk, p_blk, mat);
|
err = decode_method2(file_path, block_lost, rcv_hFile, files, s_blk, p_blk, mat);
|
||||||
#ifdef TIMER
|
#ifdef TIMER
|
||||||
if (err != 1){
|
if (err != 1){
|
||||||
time_total = GetTickCount() - time_total;
|
time_total = clock() - time_total;
|
||||||
printf("total %d.%03d sec\n", time_total / 1000, time_total % 1000);
|
printf("total %.3f sec\n", (double)time_total / CLOCKS_PER_SEC);
|
||||||
printf("matrix %d.%03d sec\n", time_matrix / 1000, time_matrix % 1000);
|
printf("matrix %.3f sec\n", (double)time_matrix / CLOCKS_PER_SEC);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ extern "C" {
|
|||||||
#define READ_MIN_RATE 1 // 保持するブロック数の 1/2 = 50%
|
#define READ_MIN_RATE 1 // 保持するブロック数の 1/2 = 50%
|
||||||
#define READ_MIN_NUM 16
|
#define READ_MIN_NUM 16
|
||||||
|
|
||||||
|
// CPU cache 最適化のため、同時に処理するブロック数を制限する
|
||||||
|
#define CACHE_MIN_NUM 8
|
||||||
|
#define CACHE_MAX_NUM 128
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
// Cache Blocking を試みる
|
// Cache Blocking を試みる
|
||||||
@@ -35,6 +39,12 @@ int read_block_num(
|
|||||||
size_t trial_alloc, // 確保できるか確認するのか
|
size_t trial_alloc, // 確保できるか確認するのか
|
||||||
int alloc_unit); // メモリー単位の境界 (sse_unit か MEM_UNIT)
|
int alloc_unit); // メモリー単位の境界 (sse_unit か MEM_UNIT)
|
||||||
|
|
||||||
|
// 1st encode, decode を何スレッドで実行するか決める
|
||||||
|
int calc_thread_num1(int max_num);
|
||||||
|
|
||||||
|
// 1st & 2nd encode, decode を何スレッドで実行するか決める
|
||||||
|
int calc_thread_num2(int max_num, int *cpu_num2);
|
||||||
|
|
||||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||||
|
|
||||||
// リード・ソロモン符号を使ってエンコードする
|
// リード・ソロモン符号を使ってエンコードする
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// repair.c
|
// repair.c
|
||||||
// Copyright : 2022-10-14 Yutaka Sawada
|
// Copyright : 2024-11-30 Yutaka Sawada
|
||||||
// License : GPL
|
// License : GPL
|
||||||
|
|
||||||
#ifndef _UNICODE
|
#ifndef _UNICODE
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
#define UNICODE
|
#define UNICODE
|
||||||
#endif
|
#endif
|
||||||
#ifndef _WIN32_WINNT
|
#ifndef _WIN32_WINNT
|
||||||
#define _WIN32_WINNT 0x0600 // Windows Vista or later
|
#define _WIN32_WINNT 0x0601 // Windows 7 or later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|||||||
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user