Some features/fixes #6

Fothsid · 2018-07-31T17:37:29Z

P.S. Added feature to disable/enable logging because size of log after around 4 hours of playing was 400 MBs lol

TheLastRar · 2018-07-31T18:37:30Z

CLR_DEV9/PSE/CLR_PSE_PluginLog.cs

+                if  ((!DEV9Header.config.EnableLogging.Error && eType == TraceEventType.Error) ||
+                    (!DEV9Header.config.EnableLogging.Verbose && eType == TraceEventType.Verbose) ||
+                    (!DEV9Header.config.EnableLogging.Information && eType == TraceEventType.Information))
+                    return;


Currently, logging is configured with LogInit() in DEV9.cs

CLR-DEV9/CLR_DEV9/DEV9.cs

Line 27 in 2795c6e

private static void LogInit()

Which currently does so based on build type (Debug or Release)

Note that LogInit() is called before the configuration file have been loaded, I'm not sure what the best option to resolve this is.

You can call SetStdOutLevel(), SetStdErrLevel() & SetFileLevel() to configure global restrictions for each output. Any log levels set in SetStdOutLevel() must be excluded inSetStdErrLevel() or else you will get duplicate messages.

Also you must allow TraceEventType.Critical to log to stderr and the log file, this level is only used here in the event of a fatal error.

CLR-DEV9/CLR_DEV9/PSE/CLR_PSE_PluginLog.cs

Line 188 in 2795c6e

public static void MsgBoxErrorTrapper(Exception e)

Not really sure how I should handle this, because as you said, LogInit() is called before the configuration file have been loaded.
When I made this, I was thinking only about how to stop these logs, I was not even thinking about build types, maybe because I can't find a way to select Release or Debug type in VS Code 0_o

I haven't used VSCode much myself, but I've made build tasks that should allow you to create release builds. (You will need to open the solution folder instead of the project folder is vscode to use the tasks)

You could either move any calls to ConfigFile.LoadConf() before any LogInit() (by moving ConfigFile.LoadConf() from Open() to Init() and reordering the calls in Config()) or by splitting LogInit() into two functions with Initialise logging with reasonable defaults before a second function is called to set logging levels as desired.

Ideally I would like to be able to enable Verbose logging on a per source level as just one source can produce a large amount entries, although the need for verbose logs doesn't come up often.

TheLastRar · 2018-07-31T19:16:11Z

CLR_DEV9/Config/ConfigLogging.cs

+        [DataMember]
+        public bool Error = true;
+        [DataMember]
+        public bool Verbose = true;


Verbose should default to false to match release build behaviour.

TheLastRar · 2018-07-31T19:20:41Z

CLR_DEV9/Config/ConfigFile.cs

@@ -47,6 +51,7 @@ private void Init()
            HddEnable = false;
            DirectConnectionSettings = new ConfigDirectIP();
            SocketConnectionSettings = new ConfigSocketIP();
+            EnableLogging = new ConfigLogging();


Do ConfigLogging's defaults apply correctly when loading an older config file (that lacks the entry)?

I remember having issues relating to that in the past.

If config file lacks the entry, it applies default values. (at least on my machine)
However, if you manually add required entries, it still applies default values until you let it recreate config file. (maybe I just did it in wrong order?)

IIRC the entries in the file have to be in a specific order for settings to be read. I'm only concerned about updating an old file, and that seems to work.

TheLastRar · 2018-07-31T19:32:05Z

CLR_DEV9_LINUX/PSE.cpp

+		if ( homedir == NULL ) {
+		    homedir = getpwuid(getuid())->pw_dir;
+		}
+		coreClrFolder = string(homedir) + string("/.config/PCSX2/coreclr");


CLR_DEV9_CORE.dll is currently found bases on the path passed to DEV9setSettingsDir while this assumes it's always in the home directory (it can be configured otherwise) Both should probably be consistent to avoid any confusion if a non-default settings path is encountered.

TheLastRar · 2018-07-31T19:34:31Z

A Release build should disable most logging that ends up in the log file, although having this configurable would be nice

Since SDL2 is one of the PCSX2's dependencies, I think this is a pretty good solution, at least for Linux systems. Should work on Windows too.

… loaded. - Moved all RELEASE build logging configurations after config file is loaded. - RELEASE build logging got enable/disable feature for each source source level through config file

TheLastRar · 2018-08-02T19:05:10Z

CLR_DEV9/PSE/CLR_PSE_PluginLog.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using CLRDEV9;


Remove the reference to CLRDEV9 as it's not needed.

TheLastRar · 2018-08-02T19:05:37Z

CLR_DEV9/PSE/CoreCLR/SDL2MessageBox.cs

+            return SDL_ShowSimpleMessageBox((uint)flags, title, message, new IntPtr(0));
+        }
+    }
+}


nitpick: Newline at end of file

TheLastRar · 2018-08-02T19:15:29Z

CLR_DEV9_LINUX/PSE.cpp

@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <pwd.h>


Remove reference if this is no-longer required.

TheLastRar

Looks good to me

Unless there is something else you want to add I will squash and merge this.

Fothsid · 2018-08-03T18:47:26Z

That's all I wanted to add xD

Fothsid added 5 commits July 31, 2018 22:26

Add a simple CMakeLists.txt to CoreCLR wrapper.

6ea5fc9

Add feature to disable/enable logging.

bbba7ba

Fix backslash addition to the name of HDD file.

5b0366c

Make path to the x86 version of CoreCLR a little bit universal.

44c1ecc

Remove useless logging.

850ad66

TheLastRar requested changes Jul 31, 2018

View reviewed changes

Fothsid added 3 commits August 1, 2018 01:39

Some changes.

7a5487c

Use SDL2's Message Boxes instead of WinForms in .NET Core build.

c5a1cc5

Since SDL2 is one of the PCSX2's dependencies, I think this is a pretty good solution, at least for Linux systems. Should work on Windows too.

- Moved all DEBUG build logging configurations before config file is…

edc6620

… loaded. - Moved all RELEASE build logging configurations after config file is loaded. - RELEASE build logging got enable/disable feature for each source source level through config file

TheLastRar requested changes Aug 2, 2018

View reviewed changes

Fothsid added 2 commits August 3, 2018 12:56

Remove references

d0afe72

moo

fce76de

TheLastRar approved these changes Aug 3, 2018

View reviewed changes

TheLastRar merged commit b85c61c into TheLastRar:master Aug 3, 2018

mentaluproar mentioned this pull request Jul 12, 2019

ubuntu 19.04 - crash on load #15

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some features/fixes #6

Some features/fixes #6

Fothsid commented Jul 31, 2018 •

edited

Loading

TheLastRar Jul 31, 2018

Fothsid Jul 31, 2018

TheLastRar Aug 1, 2018

TheLastRar Jul 31, 2018

TheLastRar Jul 31, 2018

Fothsid Jul 31, 2018

TheLastRar Jul 31, 2018

TheLastRar Jul 31, 2018

TheLastRar commented Jul 31, 2018

TheLastRar Aug 2, 2018

TheLastRar Aug 2, 2018

TheLastRar Aug 2, 2018

TheLastRar left a comment

Fothsid commented Aug 3, 2018

Some features/fixes #6

Some features/fixes #6

Conversation

Fothsid commented Jul 31, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheLastRar commented Jul 31, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheLastRar left a comment

Choose a reason for hiding this comment

Fothsid commented Aug 3, 2018

Fothsid commented Jul 31, 2018 •

edited

Loading