ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added more logging to the plugin management process (init/open/close). Added SVN_REV info to the console log. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1734 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-04 01:42:16 +00:00
parent dbeeca16a1
commit be59d1c627
4 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2/Linux/LnxConsole.cpp
View File

@ -96,12 +96,9 @@ bool Alert(const char* fmt)
{ {
GtkWidget *dialog; GtkWidget *dialog;
if (g_Startup.NoGui)
{
Console::Error(fmt); Console::Error(fmt);
if (g_Startup.NoGui)
return false; return false;
}
dialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow), dialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
@ -128,11 +125,9 @@ bool Alert(const char* fmt, VARG_PARAM dummy, ...)
if (msg[msg.length()-1] == '\n') if (msg[msg.length()-1] == '\n')
msg[msg.length()-1] = 0; msg[msg.length()-1] = 0;
if (g_Startup.NoGui)
{
Console::Error(msg.c_str()); Console::Error(msg.c_str());
if (g_Startup.NoGui)
return false; return false;
}
dialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow), dialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,

57
pcsx2/Plugins.cpp
View File

@ -316,6 +316,7 @@ int LoadGSplugin(const string& filename)
{ {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading GS..." );
GSplugin = SysLoadLibrary(filename.c_str()); GSplugin = SysLoadLibrary(filename.c_str());
if (GSplugin == NULL) { Msgbox::Alert ("Could Not Load GS Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (GSplugin == NULL) { Msgbox::Alert ("Could Not Load GS Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = GSplugin; drv = GSplugin;
@ -372,6 +373,7 @@ static s32 CALLBACK PAD1_queryMtap(u8 port) { return 0; }
int LoadPAD1plugin(const string& filename) { int LoadPAD1plugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading PAD1..." );
PAD1plugin = SysLoadLibrary(filename.c_str()); PAD1plugin = SysLoadLibrary(filename.c_str());
if (PAD1plugin == NULL) { Msgbox::Alert("Could Not Load PAD1 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (PAD1plugin == NULL) { Msgbox::Alert("Could Not Load PAD1 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = PAD1plugin; drv = PAD1plugin;
@ -409,6 +411,7 @@ static s32 CALLBACK PAD2_queryMtap(u8 port) { return 0; }
int LoadPAD2plugin(const string& filename) { int LoadPAD2plugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading PAD2..." );
PAD2plugin = SysLoadLibrary(filename.c_str()); PAD2plugin = SysLoadLibrary(filename.c_str());
if (PAD2plugin == NULL) { Msgbox::Alert("Could Not Load PAD2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (PAD2plugin == NULL) { Msgbox::Alert("Could Not Load PAD2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = PAD2plugin; drv = PAD2plugin;
@ -444,6 +447,8 @@ static s32 CALLBACK SPU2_test() { return 0; }
int LoadSPU2plugin(const string& filename) { int LoadSPU2plugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading SPU2..." );
SPU2plugin = SysLoadLibrary(filename.c_str()); SPU2plugin = SysLoadLibrary(filename.c_str());
if (SPU2plugin == NULL) { Msgbox::Alert("Could Not Load SPU2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (SPU2plugin == NULL) { Msgbox::Alert("Could Not Load SPU2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = SPU2plugin; drv = SPU2plugin;
@ -574,6 +579,8 @@ CDVD_API* CDVD = NULL;
int LoadCDVDplugin(const string& filename) { int LoadCDVDplugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading CDVD..." );
CDVDplugin = SysLoadLibrary(filename.c_str()); CDVDplugin = SysLoadLibrary(filename.c_str());
if (CDVDplugin == NULL) { Msgbox::Alert("Could Not Load CDVD Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (CDVDplugin == NULL) { Msgbox::Alert("Could Not Load CDVD Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = CDVDplugin; drv = CDVDplugin;
@ -615,6 +622,8 @@ s32 CALLBACK DEV9_test() { return 0; }
int LoadDEV9plugin(const string& filename) { int LoadDEV9plugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading DEV9..." );
DEV9plugin = SysLoadLibrary(filename.c_str()); DEV9plugin = SysLoadLibrary(filename.c_str());
if (DEV9plugin == NULL) { Msgbox::Alert("Could Not Load DEV9 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (DEV9plugin == NULL) { Msgbox::Alert("Could Not Load DEV9 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = DEV9plugin; drv = DEV9plugin;
@ -652,6 +661,8 @@ s32 CALLBACK USB_test() { return 0; }
int LoadUSBplugin(const string& filename) { int LoadUSBplugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading USB..." );
USBplugin = SysLoadLibrary(filename.c_str()); USBplugin = SysLoadLibrary(filename.c_str());
if (USBplugin == NULL) { Msgbox::Alert("Could Not Load USB Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (USBplugin == NULL) { Msgbox::Alert("Could Not Load USB Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = USBplugin; drv = USBplugin;
@ -689,6 +700,8 @@ s32 CALLBACK FW_test() { return 0; }
int LoadFWplugin(const string& filename) { int LoadFWplugin(const string& filename) {
void *drv; void *drv;
DevCon::WriteLn( "\tLoading FW..." );
FWplugin = SysLoadLibrary(filename.c_str()); FWplugin = SysLoadLibrary(filename.c_str());
if (FWplugin == NULL) { Msgbox::Alert("Could Not Load FW Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (FWplugin == NULL) { Msgbox::Alert("Could Not Load FW Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = FWplugin; drv = FWplugin;
@ -731,6 +744,8 @@ int LoadPlugins()
{ {
if (plugins_loaded) return 0; if (plugins_loaded) return 0;
Console::Status( "Loading plugins..." );
if (LoadGSplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.GS )) == -1) return -1; if (LoadGSplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.GS )) == -1) return -1;
if (LoadPAD1plugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.PAD1 )) == -1) return -1; if (LoadPAD1plugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.PAD1 )) == -1) return -1;
if (LoadPAD2plugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.PAD2 )) == -1) return -1; if (LoadPAD2plugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.PAD2 )) == -1) return -1;
@ -740,6 +755,7 @@ int LoadPlugins()
if (LoadUSBplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.USB )) == -1) return -1; if (LoadUSBplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.USB )) == -1) return -1;
if (LoadFWplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.FW )) == -1) return -1; if (LoadFWplugin( Path::Combine( Config.Paths.Plugins, Config.Plugins.FW )) == -1) return -1;
Console::Status( "Plugins loaded successfully." );
plugins_loaded = true; plugins_loaded = true;
return 0; return 0;
@ -747,9 +763,10 @@ int LoadPlugins()
bool ReportError(int err, const char *str) bool ReportError(int err, const char *str)
{ {
DevCon::WriteLn( "\tInit %s...", params str );
if (err != 0) if (err != 0)
{ {
Msgbox::Alert("%s error: %d", params str, err); Msgbox::Alert("%s plugin failed to initialize. Error Code: %d", params str, err);
return true; return true;
} }
return false; return false;
@ -757,9 +774,10 @@ bool ReportError(int err, const char *str)
bool ReportError2(int err, const char *str) bool ReportError2(int err, const char *str)
{ {
DevCon::WriteLn( "\tOpening %s...", params str );
if (err != 0) if (err != 0)
{ {
Msgbox::Alert("Error Opening %s Plugin", params str, err); Msgbox::Alert("%s plugin failed to open. Error code: %d", params str, err);
return true; return true;
} }
return false; return false;
@ -776,18 +794,20 @@ int InitPlugins()
// Ensure plugins have been loaded.... // Ensure plugins have been loaded....
if (LoadPlugins() == -1) return -1; if (LoadPlugins() == -1) return -1;
//if( !plugins_loaded ) throw Exception::InvalidOperation( "Bad coder mojo - InitPlugins called prior to plugins having been loaded." ); Console::Status( "Initializing plugins..." );
if (ReportError(GSinit(), "GSinit")) return -1; if (ReportError(GSinit(), "GS")) return -1;
if (ReportError(PAD1init(1), "PAD1init")) return -1; if (ReportError(PAD1init(1), "PAD1")) return -1;
if (ReportError(PAD2init(2), "PAD2init")) return -1; if (ReportError(PAD2init(2), "PAD2")) return -1;
if (ReportError(SPU2init(), "SPU2init")) return -1; if (ReportError(SPU2init(), "SPU2")) return -1;
if (ReportError(CDVDinit(), "CDVDinit")) return -1; if (ReportError(CDVDinit(), "CDVD")) return -1;
if (ReportError(DEV9init(), "DEV9init")) return -1; if (ReportError(DEV9init(), "DEV9")) return -1;
if (ReportError(USBinit(), "USBinit")) return -1; if (ReportError(USBinit(), "USB")) return -1;
if (ReportError(FWinit(), "FWinit")) return -1; if (ReportError(FWinit(), "FW")) return -1;
Console::Status( "Plugins initialized successfully." );
plugins_initialized = true; plugins_initialized = true;
return 0; return 0;
@ -801,6 +821,8 @@ void ShutdownPlugins()
mtgsWaitGS(); mtgsWaitGS();
ClosePlugins( true ); ClosePlugins( true );
Console::Status( "Shutting down plugins..." );
if (GSshutdown != NULL) GSshutdown(); if (GSshutdown != NULL) GSshutdown();
if (PAD1shutdown != NULL) PAD1shutdown(); if (PAD1shutdown != NULL) PAD1shutdown();
@ -815,6 +837,8 @@ void ShutdownPlugins()
if (DEV9shutdown != NULL) DEV9shutdown(); if (DEV9shutdown != NULL) DEV9shutdown();
if (USBshutdown != NULL) USBshutdown(); if (USBshutdown != NULL) USBshutdown();
if (FWshutdown != NULL) FWshutdown(); if (FWshutdown != NULL) FWshutdown();
Console::Status( "Plugin shutdown complete." );
} }
uptr pDsp; uptr pDsp;
@ -983,11 +1007,13 @@ int OpenPlugins()
{ {
if( InitPlugins() == -1 ) return -1; if( InitPlugins() == -1 ) return -1;
Console::Status( "Opening Plugins..." );
if( !OpenGS() || !OpenPAD1() || !OpenPAD2() || !OpenCDVD(NULL) || if( !OpenGS() || !OpenPAD1() || !OpenPAD2() || !OpenCDVD(NULL) ||
!OpenSPU2() || !OpenDEV9() || !OpenUSB() || !OpenFW() !OpenSPU2() || !OpenDEV9() || !OpenUSB() || !OpenFW()
) )
return -1; return -1;
Console::Status( "Plugins opened successfully." );
cdvdDetectDisk(); cdvdDetectDisk();
return 0; return 0;
} }
@ -995,6 +1021,7 @@ int OpenPlugins()
#define CLOSE_PLUGIN( name ) \ #define CLOSE_PLUGIN( name ) \
if( OpenStatus.name ) { \ if( OpenStatus.name ) { \
DevCon::WriteLn( "\tClosing " #name "..." ); \
name##close(); \ name##close(); \
OpenStatus.name = false; \ OpenStatus.name = false; \
} }
@ -1008,6 +1035,8 @@ int OpenPlugins()
void ClosePlugins( bool closegs ) void ClosePlugins( bool closegs )
{ {
Console::Status( "Closing plugins..." );
// Close pads first since they attach to the GS's window. // Close pads first since they attach to the GS's window.
CLOSE_PLUGIN( PAD1 ); CLOSE_PLUGIN( PAD1 );
@ -1017,6 +1046,8 @@ void ClosePlugins( bool closegs )
// (that's because the GS is the most complicated plugin and to close it would // (that's because the GS is the most complicated plugin and to close it would
// require we save the GS state) // require we save the GS state)
DevCon::WriteLn( "\tClosing GS..." );
if( OpenStatus.GS ) if( OpenStatus.GS )
{ {
if( closegs ) if( closegs )
@ -1030,6 +1061,7 @@ void ClosePlugins( bool closegs )
} }
} }
DevCon::WriteLn( "\tClosing CDVD..." );
CloseCDVD(); CloseCDVD();
if( OpenStatus.CDVD ) if( OpenStatus.CDVD )
@ -1042,6 +1074,7 @@ void ClosePlugins( bool closegs )
CLOSE_PLUGIN( USB ); CLOSE_PLUGIN( USB );
CLOSE_PLUGIN( FW ); CLOSE_PLUGIN( FW );
CLOSE_PLUGIN( SPU2 ); CLOSE_PLUGIN( SPU2 );
Console::Status( "Plugins closed successfully." );
} }
//used to close the GS plugin window and pads, to switch gsdx renderer //used to close the GS plugin window and pads, to switch gsdx renderer
@ -1054,6 +1087,7 @@ void CloseGS()
if( OpenStatus.GS ) if( OpenStatus.GS )
{ {
DevCon::WriteLn( "\tClosing GS..." );
gsClose(); gsClose();
OpenStatus.GS = false; OpenStatus.GS = false;
} }
@ -1097,6 +1131,7 @@ void PluginsResetGS()
if( OpenStatus.GS ) if( OpenStatus.GS )
{ {
DevCon::WriteLn( "\tClosing GS..." );
gsClose(); gsClose();
OpenStatus.GS = false; OpenStatus.GS = false;
} }

5
pcsx2/System.cpp
View File

@ -30,6 +30,7 @@
#include "R5900Exceptions.h" #include "R5900Exceptions.h"
#include "CDVD/CDVD.h" #include "CDVD/CDVD.h"
#include "svnrev.h"
using namespace std; using namespace std;
using namespace Console; using namespace Console;
@ -100,7 +101,7 @@ void SysDetect()
if( sysInitialized ) return; if( sysInitialized ) return;
sysInitialized = true; sysInitialized = true;
Notice("PCSX2 " PCSX2_VERSION " - compiled on " __DATE__ ); Notice("PCSX2 " PCSX2_VERSION " (r%d) - compiled on " __DATE__, params SVN_REV );
Notice("Savestate version: %x", params g_SaveVersion); Notice("Savestate version: %x", params g_SaveVersion);
// fixme: This line is here for the purpose of creating external ASM code. Yah. >_< // fixme: This line is here for the purpose of creating external ASM code. Yah. >_<
@ -118,7 +119,7 @@ void SysDetect()
"\tCPU vendor name = %s\n" "\tCPU vendor name = %s\n"
"\tFamilyID = %x\n" "\tFamilyID = %x\n"
"\tx86Family = %s\n" "\tx86Family = %s\n"
"\tCPU speed = %d.%03d Ghz\n" "\tCPU speed = %d.%03d ghz\n"
"\tCores = %d physical [%d logical]\n" "\tCores = %d physical [%d logical]\n"
"\tx86PType = %s\n" "\tx86PType = %s\n"
"\tx86Flags = %8.8x %8.8x\n" "\tx86Flags = %8.8x %8.8x\n"

7
pcsx2/windows/WinConsole.cpp
View File

@ -138,6 +138,8 @@ namespace Msgbox
{ {
bool Alert( const char* fmt ) bool Alert( const char* fmt )
{ {
Console::Notice( fmt );
if( !g_Startup.NoGui )
MessageBox(0, fmt, _("Pcsx2 Msg"), 0); MessageBox(0, fmt, _("Pcsx2 Msg"), 0);
return false; return false;
} }
@ -150,7 +152,10 @@ namespace Msgbox
va_list list; va_list list;
va_start(list,dummy); va_start(list,dummy);
MessageBox(0, vfmt_string(fmt,list).c_str(), _("Pcsx2 Msg"), 0); string woot( vfmt_string(fmt,list) );
Console::Notice( fmt );
if( !g_Startup.NoGui )
MessageBox(0, woot.c_str(), _("Pcsx2 Msg"), 0);
va_end(list); va_end(list);
return false; return false;