diff --git a/device/gxx-linux/main.cpp b/device/gxx-linux/main.cpp new file mode 100644 index 0000000..6279872 --- /dev/null +++ b/device/gxx-linux/main.cpp @@ -0,0 +1,48 @@ +#include +#include +#include +#include +#include +#include + +void test() +{ + auto _start = std::chrono::steady_clock::now(); + int arr[1000000]; + for (size_t i = 0; i < 1000000; i++) + { + for (size_t j = 0; j < 1000; j++) + { + arr[i] = i; + } + } + auto times = std::chrono::duration(std::chrono::steady_clock::now() - _start).count(); + printf("times = %.2f \n", times); +} + +int main(int argc, char *argv[]) +{ + struct sched_param param; + int maxpri; + maxpri = sched_get_priority_max(SCHED_FIFO); //»ñÈ¡×î´óÖµ + if (maxpri == -1) + { + printf("sched_get_priority_max() failed \n"); + exit(1); + } + printf("%d \n", maxpri); + param.sched_priority = maxpri; + std::thread threadaa(test); + // if (sched_setscheduler(getpid(), SCHED_FIFO, ¶m) == -1) //设置优先级 + // { + // printf("sched_setscheduler() failed \n"); + // exit(1); + // } + // if(pthread_setschedparam(threadaa.native_handle(),SCHED_FIFO,¶m)) + // { + // printf("sched_setscheduler() failed \n"); + // exit(1); + // } + threadaa.join(); + return 0; +} \ No newline at end of file diff --git a/pc/code_twain/sln/usb_tools/Debug/usb_tools.exe b/pc/code_twain/sln/usb_tools/Debug/usb_tools.exe index c99fa54..39cc9be 100644 Binary files a/pc/code_twain/sln/usb_tools/Debug/usb_tools.exe and b/pc/code_twain/sln/usb_tools/Debug/usb_tools.exe differ diff --git a/pc/code_twain/sln/usb_tools/DlgScanner.cpp b/pc/code_twain/sln/usb_tools/DlgScanner.cpp index e654070..63252d1 100644 --- a/pc/code_twain/sln/usb_tools/DlgScanner.cpp +++ b/pc/code_twain/sln/usb_tools/DlgScanner.cpp @@ -10,8 +10,8 @@ #include #define TIMER_ID_REFRESH_BULK 1001 -#include -#include +#include +#include HMODULE g_my_inst; diff --git a/pc/code_twain/sln/usb_tools/scanner/opt_ui/DlgSetting.cpp b/pc/code_twain/sln/usb_tools/scanner/opt_ui/DlgSetting.cpp index a5eeb73..688d0a2 100644 --- a/pc/code_twain/sln/usb_tools/scanner/opt_ui/DlgSetting.cpp +++ b/pc/code_twain/sln/usb_tools/scanner/opt_ui/DlgSetting.cpp @@ -236,6 +236,7 @@ void dlg_setting::on_init_dialog(void) MoveWindow(hwnd(), r.left, r.top, r.right - r.left, r.bottom - r.top, TRUE); size.cy -= diff; + size.cx = RECT_W(r); for (int i = 0; page = get_page(i); ++i) { MoveWindow(page->hwnd(), 0, y, size.cx, size.cy - y, TRUE); diff --git a/pc/code_twain/sln/usb_tools/scanner/scanner_handler.cpp b/pc/code_twain/sln/usb_tools/scanner/scanner_handler.cpp index 9d394d7..95073f8 100644 --- a/pc/code_twain/sln/usb_tools/scanner/scanner_handler.cpp +++ b/pc/code_twain/sln/usb_tools/scanner/scanner_handler.cpp @@ -2,8 +2,8 @@ #include "./usb/async_usb_host.h" -#include -#include +#include +#include diff --git a/pc/code_twain/sln/usb_tools/scanner/scanner_handler.h b/pc/code_twain/sln/usb_tools/scanner/scanner_handler.h index df7f0c8..a72cc22 100644 --- a/pc/code_twain/sln/usb_tools/scanner/scanner_handler.h +++ b/pc/code_twain/sln/usb_tools/scanner/scanner_handler.h @@ -4,10 +4,10 @@ // #pragma once -#include "referer.h" -#include "data.h" -#include "packet.h" -#include "ipc_util.h" +#include "common/referer.h" +#include "io/data.h" +#include "common/packet.h" +#include "common/ipc_util.h" #include #include diff --git a/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.cpp b/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.cpp index dbe0d4e..113db26 100644 --- a/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.cpp +++ b/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.cpp @@ -2,7 +2,7 @@ -#include +#include diff --git a/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.h b/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.h index 2129f38..777e012 100644 --- a/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.h +++ b/pc/code_twain/sln/usb_tools/scanner/usb/async_usb_host.h @@ -4,16 +4,16 @@ // #pragma once -#include "referer.h" -#include "data.h" -#include "packet.h" -#include "ipc_util.h" +#include "common/referer.h" +#include "io/data.h" +#include "common/packet.h" +#include "common/ipc_util.h" #include #include #include #include -#include +#include typedef struct _usb_ep diff --git a/pc/code_twain/sln/usb_tools/usb_tools.vcxproj b/pc/code_twain/sln/usb_tools/usb_tools.vcxproj index e4bb095..c34a270 100644 --- a/pc/code_twain/sln/usb_tools/usb_tools.vcxproj +++ b/pc/code_twain/sln/usb_tools/usb_tools.vcxproj @@ -76,7 +76,7 @@ true - $(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\common\;$(IncludePath) + $(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\async_model\;$(IncludePath) $(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) @@ -86,7 +86,7 @@ false - $(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\common\;$(IncludePath) + $(ProjectDir)..\..\..\sdk\include\;$(ProjectDir)..\..\device\win_usb\;$(ProjectDir)..\sdk\include\;$(ProjectDir)..\..\..\..\device\gxx-linux\usb\src\async_model\;$(IncludePath) $(SolutionDir)sdk\lib\$(Configuration);$(ProjectDir)..\..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) @@ -196,14 +196,15 @@ - - - - - - - - + + + + + + + + + @@ -224,48 +225,37 @@ - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - + NotUsing NotUsing - - NotUsing - - + NotUsing NotUsing - NotUsing - NotUsing - + NotUsing NotUsing - NotUsing - NotUsing - + + NotUsing + NotUsing + + + NotUsing + NotUsing + + + NotUsing + NotUsing + + + NotUsing + NotUsing + + NotUsing NotUsing - NotUsing - NotUsing NotUsing diff --git a/pc/code_twain/sln/usb_tools/usb_tools.vcxproj.filters b/pc/code_twain/sln/usb_tools/usb_tools.vcxproj.filters index c8df840..40ed327 100644 --- a/pc/code_twain/sln/usb_tools/usb_tools.vcxproj.filters +++ b/pc/code_twain/sln/usb_tools/usb_tools.vcxproj.filters @@ -57,30 +57,9 @@ Imports\usbview - - Imports - - - Imports - - - Imports - - - Imports - 头文件 - - Imports - - - Imports - - - Imports - scanner @@ -102,7 +81,31 @@ opt-ui - + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + Imports @@ -125,30 +128,9 @@ Imports\usbview - - Imports - - - Imports - - - Imports - - - Imports - 源文件 - - Imports - - - Imports - - - Imports - scanner @@ -170,7 +152,28 @@ opt-ui - + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + + Imports + + Imports diff --git a/pc/code_twain/sln/usb_tools/usb_toolsDlg.cpp b/pc/code_twain/sln/usb_tools/usb_toolsDlg.cpp index 28877b3..4aa4730 100644 --- a/pc/code_twain/sln/usb_tools/usb_toolsDlg.cpp +++ b/pc/code_twain/sln/usb_tools/usb_toolsDlg.cpp @@ -21,8 +21,8 @@ #pragma warning(disable: 4996) -#include -#include +#include +#include namespace usb {