/[svn]/qsampler/trunk/src/qsamplerMessages.cpp
ViewVC logotype

Diff of /qsampler/trunk/src/qsamplerMessages.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3357 by capela, Tue Oct 17 21:44:20 2017 UTC revision 3759 by capela, Sat Mar 28 00:28:13 2020 UTC
# Line 1  Line 1 
1  // qsamplerMessages.cpp  // qsamplerMessages.cpp
2  //  //
3  /****************************************************************************  /****************************************************************************
4     Copyright (C) 2004-2017, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2020, rncbc aka Rui Nuno Capela. All rights reserved.
5     Copyright (C) 2007, Christian Schoenebeck     Copyright (C) 2007, Christian Schoenebeck
6    
7     This program is free software; you can redistribute it and/or     This program is free software; you can redistribute it and/or
# Line 34  Line 34 
34  #include <QDateTime>  #include <QDateTime>
35  #include <QIcon>  #include <QIcon>
36    
37  #if !defined(_WIN32)  #if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)
38  #include <unistd.h>  #include <unistd.h>
39  #include <fcntl.h>  #include <fcntl.h>
40  #endif  #endif
41    
42    
43    // Deprecated QTextStreamFunctions/Qt namespaces workaround.
44    #if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
45    #define endl    Qt::endl
46    #endif
47    
48    
49  namespace QSampler {  namespace QSampler {
50    
51  // The default maximum number of message lines.  // The default maximum number of message lines.
# Line 63  Messages::Messages ( QWidget *pParent ) Line 69  Messages::Messages ( QWidget *pParent )
69          QDockWidget::setObjectName("qsamplerMessages");          QDockWidget::setObjectName("qsamplerMessages");
70    
71          // Intialize stdout capture stuff.          // Intialize stdout capture stuff.
72          m_pStdoutNotifier = NULL;          m_pStdoutNotifier = nullptr;
73          m_fdStdout[QSAMPLER_MESSAGES_FDREAD]  = QSAMPLER_MESSAGES_FDNIL;          m_fdStdout[QSAMPLER_MESSAGES_FDREAD]  = QSAMPLER_MESSAGES_FDNIL;
74          m_fdStdout[QSAMPLER_MESSAGES_FDWRITE] = QSAMPLER_MESSAGES_FDNIL;          m_fdStdout[QSAMPLER_MESSAGES_FDWRITE] = QSAMPLER_MESSAGES_FDNIL;
75    
# Line 81  Messages::Messages ( QWidget *pParent ) Line 87  Messages::Messages ( QWidget *pParent )
87          m_iMessagesLines = 0;          m_iMessagesLines = 0;
88          setMessagesLimit(QSAMPLER_MESSAGES_MAXLINES);          setMessagesLimit(QSAMPLER_MESSAGES_MAXLINES);
89    
90          m_pMessagesLog = NULL;          m_pMessagesLog = nullptr;
91    
92          // Prepare the dockable window stuff.          // Prepare the dockable window stuff.
93          QDockWidget::setWidget(m_pMessagesTextView);          QDockWidget::setWidget(m_pMessagesTextView);
# Line 116  Messages::~Messages (void) Line 122  Messages::~Messages (void)
122  // Set stdout/stderr blocking mode.  // Set stdout/stderr blocking mode.
123  bool Messages::stdoutBlock ( int fd, bool bBlock ) const  bool Messages::stdoutBlock ( int fd, bool bBlock ) const
124  {  {
125  #if !defined(_WIN32)  #if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)
126          const int iFlags = ::fcntl(fd, F_GETFL, 0);          const int iFlags = ::fcntl(fd, F_GETFL, 0);
127          const bool bNonBlock = bool(iFlags & O_NONBLOCK);          const bool bNonBlock = bool(iFlags & O_NONBLOCK);
128          if (bBlock && bNonBlock)          if (bBlock && bNonBlock)
# Line 132  bool Messages::stdoutBlock ( int fd, boo Line 138  bool Messages::stdoutBlock ( int fd, boo
138  // Own stdout/stderr socket notifier slot.  // Own stdout/stderr socket notifier slot.
139  void Messages::stdoutNotify ( int fd )  void Messages::stdoutNotify ( int fd )
140  {  {
141  #if !defined(_WIN32)  #if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)
142          // Set non-blocking reads, if not already...          // Set non-blocking reads, if not already...
143          const bool bBlock = stdoutBlock(fd, false);          const bool bBlock = stdoutBlock(fd, false);
144          // Read as much as is available...          // Read as much as is available...
# Line 182  void Messages::flushStdoutBuffer (void) Line 188  void Messages::flushStdoutBuffer (void)
188  // Stdout capture accessors.  // Stdout capture accessors.
189  bool Messages::isCaptureEnabled (void)  bool Messages::isCaptureEnabled (void)
190  {  {
191          return (m_pStdoutNotifier != NULL);          return (m_pStdoutNotifier != nullptr);
192  }  }
193    
194  void Messages::setCaptureEnabled ( bool bCapture )  void Messages::setCaptureEnabled ( bool bCapture )
# Line 190  void Messages::setCaptureEnabled ( bool Line 196  void Messages::setCaptureEnabled ( bool
196          // Flush current buffer.          // Flush current buffer.
197          flushStdoutBuffer();          flushStdoutBuffer();
198    
199  #if !defined(_WIN32)  #if !defined(__WIN32__) && !defined(_WIN32) && !defined(WIN32)
200          // Destroy if already enabled.          // Destroy if already enabled.
201          if (!bCapture && m_pStdoutNotifier) {          if (!bCapture && m_pStdoutNotifier) {
202                  delete m_pStdoutNotifier;                  delete m_pStdoutNotifier;
203                  m_pStdoutNotifier = NULL;                  m_pStdoutNotifier = nullptr;
204                  // Close the notification pipes.                  // Close the notification pipes.
205                  if (m_fdStdout[QSAMPLER_MESSAGES_FDREAD] != QSAMPLER_MESSAGES_FDNIL) {                  if (m_fdStdout[QSAMPLER_MESSAGES_FDREAD] != QSAMPLER_MESSAGES_FDNIL) {
206                          ::close(m_fdStdout[QSAMPLER_MESSAGES_FDREAD]);                          ::close(m_fdStdout[QSAMPLER_MESSAGES_FDREAD]);
# Line 202  void Messages::setCaptureEnabled ( bool Line 208  void Messages::setCaptureEnabled ( bool
208                  }                  }
209          }          }
210          // Are we going to make up the capture?          // Are we going to make up the capture?
211          if (bCapture && m_pStdoutNotifier == NULL && ::pipe(m_fdStdout) == 0) {          if (bCapture && m_pStdoutNotifier == nullptr && ::pipe(m_fdStdout) == 0) {
212                  ::dup2(m_fdStdout[QSAMPLER_MESSAGES_FDWRITE], STDOUT_FILENO);                  ::dup2(m_fdStdout[QSAMPLER_MESSAGES_FDWRITE], STDOUT_FILENO);
213                  ::dup2(m_fdStdout[QSAMPLER_MESSAGES_FDWRITE], STDERR_FILENO);                  ::dup2(m_fdStdout[QSAMPLER_MESSAGES_FDWRITE], STDERR_FILENO);
214                  m_pStdoutNotifier = new QSocketNotifier(                  m_pStdoutNotifier = new QSocketNotifier(
# Line 242  void Messages::setMessagesLimit ( int iM Line 248  void Messages::setMessagesLimit ( int iM
248  // Messages logging stuff.  // Messages logging stuff.
249  bool Messages::isLogging (void) const  bool Messages::isLogging (void) const
250  {  {
251          return (m_pMessagesLog != NULL);          return (m_pMessagesLog != nullptr);
252  }  }
253    
254  void Messages::setLogging ( bool bEnabled, const QString& sFilename )  void Messages::setLogging ( bool bEnabled, const QString& sFilename )
# Line 252  void Messages::setLogging ( bool bEnable Line 258  void Messages::setLogging ( bool bEnable
258                          .arg(QDateTime::currentDateTime().toString()));                          .arg(QDateTime::currentDateTime().toString()));
259                  m_pMessagesLog->close();                  m_pMessagesLog->close();
260                  delete m_pMessagesLog;                  delete m_pMessagesLog;
261                  m_pMessagesLog = NULL;                  m_pMessagesLog = nullptr;
262          }          }
263    
264          if (bEnabled) {          if (bEnabled) {
# Line 262  void Messages::setLogging ( bool bEnable Line 268  void Messages::setLogging ( bool bEnable
268                                  .arg(QDateTime::currentDateTime().toString()));                                  .arg(QDateTime::currentDateTime().toString()));
269                  } else {                  } else {
270                          delete m_pMessagesLog;                          delete m_pMessagesLog;
271                          m_pMessagesLog = NULL;                          m_pMessagesLog = nullptr;
272                  }                  }
273          }          }
274  }  }
Legend:
Removed from v.3357  
changed lines
  Added in v.3759
  ViewVC Help
Powered by ViewVC