feat: add arg_parser to user_request

Author: nader-zouaoui

wperf/arg-parser.cpp

@@ -28,13 +28,15 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "arg-parser.h"
 #include <iostream>
 #include <codecvt>
 #include <locale>
 #include <cwchar>
 #include <vector>
 #include <sstream>
+#include "arg-parser.h"
+#include "output.h"
+#include "exception.h"
 
 namespace ArgParser {
     arg_parser::arg_parser() {}
@@ -101,26 +103,26 @@ namespace ArgParser {
 
     void arg_parser::print_help() const
     {
-        std::wcout << L"NAME:\n"
+        m_out.GetOutputStream() << L"NAME:\n"
 
             << L"\twperf - Performance analysis tools for Windows on Arm\n\n"
             << L"\tUsage: wperf <command> [options]\n\n"
             << L"SYNOPSIS:\n\n";
         for (auto& command : m_commands_list)
         {
-            std::wcout << L"\t" << command->get_all_flags_string() << L"\n" << command->get_usage_text() << L"\n";
+            m_out.GetOutputStream() << L"\t" << command->get_all_flags_string() << L"\n" << command->get_usage_text() << L"\n";
         }
 
-        std::wcout << L"OPTIONS:\n\n";
+        m_out.GetOutputStream() << L"OPTIONS:\n\n";
         for (auto& flag : m_flags_list)
         {
-            std::wcout << L" " << flag->get_help() << L"\n";
+            m_out.GetOutputStream() << L" " << flag->get_help() << L"\n";
         }
-        std::wcout << L"EXAMPLES:\n\n";
+        m_out.GetOutputStream() << L"EXAMPLES:\n\n";
         for (auto& command : m_commands_list)
         {
             if (command->get_examples().empty()) continue;
-            std::wcout << L"  " << command->get_examples() << L"\n";
+            m_out.GetOutputStream() << L"  " << command->get_examples() << L"\n";
         }
     }
 
@@ -155,8 +157,8 @@ namespace ArgParser {
         if (!additional_message.empty()) {
             error_message << additional_message << L"\n";
         }
-        std::wcerr << error_message.str();
-        throw std::invalid_argument("INVALID_ARGUMENT");
+        m_out.GetErrorOutputStream() << error_message.str();
+        throw fatal_exception("INVALID_ARGUMENT");
     }
 
 #pragma endregion

wperf/arg-parser.h

@@ -58,7 +58,7 @@ namespace ArgParser {
         MAN,
         NO_COMMAND
     };
-    class arg_parser_arg_command : public arg_parser_arg_opt {
+    class arg_parser_arg_command : public arg_parser_arg_pos {
 
     public:
         arg_parser_arg_command(
@@ -67,8 +67,9 @@ namespace ArgParser {
             const std::wstring description,
             const std::wstring useage_text,
             const COMMAND_CLASS command,
-            const wstr_vec examples
-        ) : arg_parser_arg_opt(name, alias, description), m_examples(examples), m_command(command), m_useage_text(useage_text) {};
+            const wstr_vec examples,
+			const int arg_count = 0
+        ) : arg_parser_arg_pos(name, alias, description, {}, arg_count), m_examples(examples), m_command(command), m_useage_text(useage_text) {};
         const COMMAND_CLASS m_command = COMMAND_CLASS::NO_COMMAND;
         const wstr_vec m_examples;
         const std::wstring m_useage_text;
@@ -180,7 +181,8 @@ namespace ArgParser {
             L"wperf man [--json]",
             COMMAND_CLASS::MAN,
             {
-            }
+            },
+            1
             );
 
 #pragma endregion
@@ -346,7 +348,7 @@ namespace ArgParser {
             {}
         );
         arg_parser_arg_pos iteration_arg = arg_parser_arg_pos::arg_parser_arg_pos(
-            L"-i",
+            L"-n",
             {},
             L"Number of consecutive counts in timeline mode (disabled by default).",
             {}

wperf/main.cpp

@@ -50,6 +50,7 @@
 #include "config.h"
 #include "perfdata.h"
 #include "disassembler.h"
+#include "arg-parser.h"
 
 static bool no_ctrl_c = true;
 
@@ -81,35 +82,27 @@ wmain(
 )
 {
     auto exit_code = EXIT_SUCCESS;
+    ArgParser::arg_parser arg_parser;
+	arg_parser.parse(argc, argv);
+    
 
     user_request request;
     pmu_device pmu_device;
-    wstr_vec raw_args;
 
     LLVMDisassembler disassembler;
     bool spawned_process = false;
     HANDLE process_handle = NULL;
     PROCESS_INFORMATION pi;
     ZeroMemory(&pi, sizeof(pi));
 
-    //* Handle CLI options before we initialize PMU device(s)
-    for (int i = 1; i < argc; i++)
-        raw_args.push_back(argv[i]);
-
-    pmu_device.do_force_lock = user_request::is_force_lock(raw_args);
-
-    if (raw_args.size() == 1 && user_request::is_help(raw_args))
+    if (arg_parser.m_command == ArgParser::COMMAND_CLASS::HELP)
     {
-        user_request::print_help();
+        arg_parser.print_help();
         goto clean_exit;
     }
 
-    if (raw_args.empty())
-    {
-        user_request::print_help_header();
-        user_request::print_help_prompt();
-        goto clean_exit;
-    }
+    pmu_device.do_force_lock = arg_parser.force_lock_opt.is_set();
+
     //* Handle CLI options before we initialize PMU device(s)
 
     try {
@@ -162,7 +155,7 @@ wmain(
     {
         struct pmu_device_cfg pmu_cfg;
         pmu_device.get_pmu_device_cfg(pmu_cfg);
-        request.init(raw_args, pmu_cfg,
+        request.init(arg_parser, pmu_cfg,
             pmu_device.builtin_metrics,
             pmu_device.get_product_groups_metrics_names(),
             pmu_events::extra_events);
@@ -1340,7 +1333,8 @@ wmain(
 #if defined(ENABLE_ETW_TRACING_APP)
     EventUnregisterWindowsPerf_App();
 #endif
-
+    std::wstring hellp;
+    std::wcin >> hellp;
     if(spawned_process)
     {
         TerminateProcess(pi.hProcess, 0);