github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-07-11 22:02:34 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

frmLog change. The database survey has been moved to a separate thread.

Browse source 
Опрос баз данных перенесен из GUI потока в отдельный поток.
This commit is contained in:
lsv 2023-09-27 09:45:33 +05:00 • committed by lsv
parent 9676013083
commit fc71d91348
2 changed files with 209 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

172
frm/frmLog.cpp
View file

@ -81,6 +81,14 @@ void frmLog::OnClose(wxCloseEvent& event) {
event.Veto();
return;
}
DBthread->DoTerminate();
while (!DBthread->isReadyRows()) {
wxThread::Sleep(50);
wxYield();
}
DBthread->GoReadRows();
wxThread::Sleep(50);
event.Skip();
}
@ -267,34 +275,86 @@ void frmLog::OnSetDetailGroup(wxCommandEvent& event)
my_view->ViewGroup(false);
}
}
void* MyThread::Entry() {
void frmLog::getFilename() {
pgSet* set;
wxString namepage;
for (size_t i = 0;i< conArray.GetCount(); i++) {
while (!m_exit)
{
{
wxMutexLocker lock(s_mutexDBReading);
m_addNewRows.Clear();
m_serversName.Clear();
m_startRowsSevers.Clear();
getFilename();
}
s_goRead.Wait();
if (m_exit) break;
}
return NULL;
}
wxString MyThread::AppendNewRows(MyDataViewCtrl* my_view, Storage* st) {
//Storage* st = m_storage_model->getStorage();
//int rows = st->getCountStore();
int ra, ri;
st->ClearRowsStat();
my_view->Freeze();
for (size_t i = 0; i < m_startRowsSevers.GetCount(); i++) {
if (m_exit) return "exit";
int sr = m_startRowsSevers[i];
int er = m_addNewRows.GetCount();
if ((i+1)< m_startRowsSevers.GetCount()) er= m_startRowsSevers[i+1];
if (sr == er) continue;
st->SetHost(m_serversName[i]);
for (int k = sr; k < er; k++) {
if (m_exit) return "exit";
wxString ss = m_addNewRows[k];
if (ss.IsEmpty())
continue;
my_view->AddRow(ss);
}
}
st->GetRowsStat(ra, ri);
my_view->Thaw();
//int newrows = st->getCountStore();
//if (loglen !=logfileLength)
if (st->GetErrMsgFlag()) {
m_seticon=true;
}
return wxString::Format("Add rows %d ignore %d. View rows ", ra, ri);
}
void MyThread::getFilename() {
pgSet* set;
namepage = "";
m_seticon = false;
for (size_t i = 0; i < m_conArray.GetCount(); i++) {
if (m_exit) break;
RemoteConn2* po = (RemoteConn2*) m_conArray[i];
wxString dbname = po->conn->GetDbname();
if (!namepage.IsEmpty()) namepage += ",";
if (!conArray[i].conn->IsAlive()) {
m_serversName.Add(po->conn->GetHostName());
m_startRowsSevers.Add(m_addNewRows.GetCount());
if (!po->conn->IsAlive()) {
wxDateTime n = wxDateTime::Now();
seticon(true);
if (conArray[i].nextrun < n) {
if (!conArray[i].conn->Reconnect(false))
m_seticon = true;
if (po->nextrun < n) {
if (!po->conn->Reconnect(false))
{
wxTimeSpan sp(0, 2);
conArray[i].nextrun = wxDateTime::Now() + sp;
namepage += " " + conArray[i].conn->GetDbname();
po->nextrun = wxDateTime::Now() + sp;
namepage += " " + dbname;
continue;
}
}
else {
namepage += " " + conArray[i].conn->GetDbname();
namepage += " " + dbname;
continue;
}
}
set = conArray[i].conn->ExecuteSet(
set = po->conn->ExecuteSet(
wxT("select current_setting('log_directory')||'/'||name filename,modification filetime,size len\n")
wxT(" FROM pg_ls_logdir() where name ~ '.csv' ORDER BY modification DESC"));
if (set)
@ -302,25 +362,27 @@ void frmLog::getFilename() {
//logfileTimestamp = set->GetDateTime(wxT("filetime"));
len[i] = set->GetLong(wxT("len"));
namepage += conArray[i].conn->GetDbname();
m_storage_model->getStorage()->SetHost(conArray[i].conn->GetHostName());
namepage += dbname;
//m_storage_model->getStorage()->SetHost(m_conArray[i].conn->GetHostName());
//m_startRowsSevers[i] = m_addNewRows.GetCount();
wxString fn = set->GetVal(wxT("filename"));
if (fn != logfileName[i]) {
logfileLength[i] = 0;
logfileName[i] = fn;
}
/// addLogFile(logfileName, logfileTimestamp, len, logfileLength, skipFirst);
delete set;
readLogFile(logfileName[i],len[i],logfileLength[i],savedPartialLine[i],conArray[i].conn);
readLogFile(logfileName[i], len[i], logfileLength[i], savedPartialLine[i], po->conn);
//m_startRowsSevers[i] = m_addNewRows.GetCount();
//if (m_startRowsSevers[i] == m_addNewRows.GetCount()) m_startRowsSevers[i] = FLAG_MAX_LINE;
}
}
if (namepage.IsEmpty()) namepage = "not connect";
if (m_notebook->GetPageText(0) != namepage) m_notebook->SetPageText(0, namepage);
//if (namepage.IsEmpty()) namepage = "not connect";
//if (m_notebook->GetPageText(0) != namepage) m_notebook->SetPageText(0, namepage);
}
void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,wxString& savedPartialLine,pgConn* conn) {
void MyThread::readLogFile(wxString logfileName, long& lenfile, long& logfileLength, wxString& savedPartialLine, pgConn* conn) {
wxString line;
// If GPDB 3.3 and later, log is normally in CSV format. Let's get a whole log line before calling addLogLine,
@ -343,6 +405,7 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
while (lenfile > logfileLength)
{
//statusBar->SetStatusText(_("Reading log from server..."));
if (m_exit) return;
pgSet* set = conn->ExecuteSet(wxT("SELECT ") + funcname +
conn->qtDbString(logfileName) + wxT(", ") + NumToStr(logfileLength) + wxT(", 50000)"));
if (!set)
@ -359,7 +422,7 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
}
char* raw;
unsigned char m[50001];
if (settings->GetASUTPstyle()||true) {
if (true) {
raw = (char*)&m[0];
unsigned char c;
@ -408,10 +471,11 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
else {
raw = raw1;
}
int l= strlen(raw);
int l = strlen(raw);
logfileLength += l;
wxString host = conn->GetHostName();
status->SetLabelText(wxString::Format("%s Load bytes %ld", host,logfileLength));
//status->SetLabelText(wxString::Format("%s Load bytes %ld", host, logfileLength));
sendText(wxString::Format("%s Load bytes %ld", host, logfileLength));
wxString str;
str = line + wxTextBuffer::Translate(wxString(raw, set->GetConversion()), wxTextFileType_Unix);
//if (wxString(wxString(raw, wxConvLibc).wx_str(), wxConvUTF8).Len() > 0)
@ -425,8 +489,9 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
if (str.Len() == 0)
{
wxString msgstr = _("The server log contains entries in multiple encodings and cannot be displayed by pgAdmin.");
wxMessageBox(msgstr);
wxString msgstr = host+" The server log contains entries in multiple encodings and cannot be displayed by pgAdmin.";
//wxMessageBox(msgstr);
sendText(msgstr);
return;
}
@ -437,8 +502,8 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
CSVLineTokenizer tk(str);
my_view->Freeze();
//my_view->Freeze();
while (tk.HasMoreLines())
{
line.Clear();
@ -453,12 +518,13 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
// Looks like we have a good complete CSV log record.
//addLogLine(str.Trim(), true, true);
my_view->AddRow(str.Trim());
//my_view->AddRow(str.Trim());
m_addNewRows.Add(str.Trim());
}
my_view->Thaw();
//my_view->Thaw();
}
else
{
@ -476,24 +542,35 @@ void frmLog::readLogFile(wxString logfileName,long& lenfile,long& logfileLength,
line.Clear();
}
else
my_view->AddRow(line.Trim());
//my_view->AddRow(line.Trim());
m_addNewRows.Add(line.Trim());
}
}
void frmLog::OnAddLabelTextThread(wxThreadEvent& event) {
wxString s=event.GetString();
if (!msgtext.IsEmpty() && !s.IsEmpty()) s += " : ";
s += msgtext;
status->SetLabelText(s);
}
void frmLog::OnTimer(wxTimerEvent& event) {
Storage* st = m_storage_model->getStorage();
//int rows = st->getCountStore();
int ra, ri;
st->ClearRowsStat();
getFilename();
st->GetRowsStat(ra, ri);
//int newrows = st->getCountStore();
//if (loglen !=logfileLength)
if (m_storage_model->getStorage()->GetErrMsgFlag()) {
if (!DBthread->isReadyRows()) return;
wxString rez=DBthread->AppendNewRows(my_view, m_storage_model->getStorage());
msgtext = wxString::Format("%s%d", rez, m_storage_model->GetRowCount());
status->SetLabelText(msgtext);
if (DBthread->IsIconError()) {
seticon(true);
}
status->SetLabelText(wxString::Format("Add rows %d ignore %d. View rows %d", ra,ri, m_storage_model->GetRowCount()) );
wxString namepage= DBthread->getNamePage();
if (namepage.IsEmpty()) namepage = "not connect";
if (m_notebook->GetPageText(0) != namepage) m_notebook->SetPageText(0, namepage);
DBthread->GoReadRows();
}
#include "log/log_xpm.xpm"
@ -1070,6 +1147,13 @@ frmLog::frmLog(frmMain *form, const wxString &_title, pgServer *srv) : pgFrame(N
my_view->setGroupMode(b);
my_view->ModUserFilter("","Init", listUserFilter, contentFilter);
// if (mainForm) getFilename();
Connect(wxID_ANY, wxEVT_THREAD, wxThreadEventHandler(frmLog::OnAddLabelTextThread), NULL, this);
DBthread = new MyThread(conArray,this);
if (DBthread->Create() != wxTHREAD_NO_ERROR)
{
wxLogError(wxT("Can’t create thread!"));
}
DBthread->Run();
m_timer.Start(timerInterval);
}
pgServer* frmLog::getServer(wxString& strserver) {

88
include/frm/frmLog.h
View file

@ -19,8 +19,6 @@
#include <wx/notebook.h>
#include <wx/notebook.h>
#include <wx/dynarray.h>
// wxAUI
#include <wx/aui/aui.h>
@ -29,7 +27,10 @@
#include "ctl/ctlAuiNotebook.h"
#include "log/StorageModel.h"
#include "log/MyDataViewCtrl.h"
#include <wx/thread.h>
static wxMutex s_mutexDBReading;
static wxSemaphore s_goRead(0,1);
class RemoteConn2
{
public:
@ -82,7 +83,7 @@ enum
#endif
#endif
#define FLAG_MAX_LINE 9999999999
class MywxAuiDefaultTabArt : public wxAuiDefaultTabArt
{
public:
@ -106,6 +107,73 @@ public:
int close_button_state,
int* x_extent) wxOVERRIDE;
};
class MyThread : public wxThread
{
public:
MyThread(RemoteConnArray2 &conArray, wxWindow* p)
{
//m_addNewRows = addNewRows;
//m_serversName = serversName;
//m_startRowsSevers = startRowsSevers;
theParent = p;
for (size_t i = 0; i < conArray.GetCount(); i++) {
logfileName.Add("");
savedPartialLine.Add("");
logfileLength.Add(0);
len.Add(0);
RemoteConn2* po = (RemoteConn2*)&conArray[i];
wxString db = po->conn->GetDbname();
m_conArray.Add(po);
}
}
wxString getNamePage() { return namepage; }
bool IsIconError() { return m_seticon; }
void DoTerminate() { m_exit = true; return; }
wxString AppendNewRows(MyDataViewCtrl* my_view, Storage* st);
bool isReadyRows() {
wxMutexError e=s_mutexDBReading.TryLock();
if (e == wxMUTEX_NO_ERROR) {
s_mutexDBReading.Unlock();
return true;
}
return false;
}
bool GoReadRows() {
wxSemaError e = s_goRead.Post();
if (e == wxSEMA_NO_ERROR) {
return true;
}
//wxLogError("Semafore return error");
return false;
}
virtual void* Entry();
private:
void readLogFile(wxString logfileName, long& lenfile, long& logfileLength, wxString& savedPartialLine, pgConn* conn);
void getFilename();
void sendText(wxString s) {
wxThreadEvent e(wxEVT_THREAD);
e.SetString(s);
theParent->GetEventHandler()->AddPendingEvent(e);
}
wxWindow* theParent;
wxArrayPtrVoid m_conArray;
wxArrayString m_addNewRows;
wxArrayString m_serversName;
wxArrayLong m_startRowsSevers;
bool m_exit = false;
bool m_seticon = false;
wxString namepage;
//
wxArrayString logfileName;
wxArrayString savedPartialLine;
wxArrayLong logfileLength;
wxArrayLong len;
};
class frmLog : public pgFrame
@ -114,8 +182,6 @@ public:
frmLog(frmMain *form, const wxString &_title, pgServer *srv);
~frmLog();
void Go();
void getFilename();
void readLogFile(wxString logfileName, long& lenfile, long& logfileLength, wxString& savedPartialLine, pgConn* conn);
void AddNewConn(pgConn* con);
pgServer* getServer(wxString& strserver);
pgConn* createConn(pgServer* srv);
@ -124,7 +190,7 @@ private:
static const int timerInterval = 5000; // 1000 ms
wxTimer m_timer;
wxAuiManager manager;
wxString msgtext;
frmMain *mainForm;
pgConn *connection;
RemoteConnArray2 conArray;
@ -137,10 +203,18 @@ private:
wxComboBox* smart;
wxTextCtrl* contentFilter;
wxObjectDataPtr<StorageModel> m_storage_model;
MyThread* DBthread;
// Shared variable
//
wxArrayString addNewRows; // Thread appeend rows
wxArrayString serversName; //
wxArrayLong startRowsSevers;
//
wxArrayString logfileName;
wxArrayString savedPartialLine;
wxArrayLong logfileLength;
wxArrayLong len;
void OnSetGroup(wxCommandEvent& event);
void OnSetDetailGroup(wxCommandEvent& event);
void OnClearAllFilter(wxCommandEvent& event);
@ -159,7 +233,7 @@ private:
void OnActivate(wxActivateEvent& event);
void OnTimer(wxTimerEvent& event);
void seticon(bool errflag);
void OnAddLabelTextThread(wxThreadEvent& event);
wxIcon idef;
wxIcon idefRed;