Skip to content

Commit

Permalink
Removed class ELdestControl
Browse files Browse the repository at this point in the history 
THe ELdestControl was just a wrapper around an ELdestination to attempt
to keep people from deleting it.
  • Loading branch information
@Dr15Jones
Dr15Jones committed May 25, 2017
1 parent 09f887d commit 613947a
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 470 deletions.
5 changes: 2 additions & 3 deletions FWCore/MessageService/interface/ELadministrator.h
View file
Expand Up @@ -49,12 +49,11 @@
//
// ----------------------------------------------------------------------

#include "FWCore/MessageService/interface/ELdestControl.h"

#include "FWCore/MessageLogger/interface/ELstring.h"
#include "FWCore/MessageLogger/interface/ELlist.h"
#include "FWCore/MessageLogger/interface/ELseverityLevel.h"
#include "FWCore/MessageLogger/interface/ErrorObj.h"
#include "FWCore/MessageService/interface/ELdestination.h"
#include "FWCore/Utilities/interface/propagate_const.h"

#include <memory>
Expand Down Expand Up @@ -94,7 +93,7 @@ class ELadministrator { // *** Destructable Singleton Pattern ***

// --- furnish/recall destinations:
//
ELdestControl attach( std::shared_ptr<ELdestination> sink );
std::shared_ptr<ELdestination> attach( std::shared_ptr<ELdestination> sink );

// --- handle severity information:
//
Expand Down
125 changes: 0 additions & 125 deletions FWCore/MessageService/interface/ELdestControl.h
View file

This file was deleted.

42 changes: 23 additions & 19 deletions FWCore/MessageService/interface/ELdestination.h
View file
Expand Up @@ -43,7 +43,6 @@ namespace service {
// prerequisite classes:
// ----------------------------------------------------------------------

class ELdestControl;
class ELadministrator;


Expand All @@ -54,7 +53,6 @@ class ELadministrator;
class ELdestination {

friend class ELadministrator;
friend class ELdestControl;

public:

Expand All @@ -70,9 +68,30 @@ class ELdestination {

virtual void finish();

// ----- Methods invoked through the ELdestControl handle:
// ----- Behavior control methods invoked by the framework:
//
protected:
void setThreshold( const ELseverityLevel & sv );
void setTraceThreshold( const ELseverityLevel & sv );
void setLimit( const ELstring & s, int n );
void setLimit( const ELseverityLevel & sv, int n );
void setInterval( const ELstring & s, int interval );
void setInterval( const ELseverityLevel& sv, int interval);
void setTimespan( const ELstring& s, int n );
void setTimespan( const ELseverityLevel & sv, int n );

// ----- Select output format options:
//
virtual void suppressText(); virtual void includeText(); // $$ jvr
virtual void suppressModule(); virtual void includeModule();
virtual void suppressSubroutine(); virtual void includeSubroutine();
virtual void suppressTime(); virtual void includeTime();
virtual void suppressContext(); virtual void includeContext();
virtual void suppressSerial(); virtual void includeSerial();
virtual void useFullContext(); virtual void useContext();
virtual void separateTime(); virtual void attachTime();
virtual void separateEpilogue(); virtual void attachEpilogue();
virtual int setLineLength(int len); virtual int getLineLength() const;

virtual void wipe();
virtual void zero();
virtual void filterModule( ELstring const & moduleName );
Expand All @@ -87,22 +106,7 @@ class ELdestination {
virtual void changeFile (const ELstring & filename);
virtual void flush();

// ----- Select output format options:
//
private:
virtual void suppressText(); virtual void includeText(); // $$ jvr
virtual void suppressModule(); virtual void includeModule();
virtual void suppressSubroutine(); virtual void includeSubroutine();
virtual void suppressTime(); virtual void includeTime();
virtual void suppressContext(); virtual void includeContext();
virtual void suppressSerial(); virtual void includeSerial();
virtual void useFullContext(); virtual void useContext();
virtual void separateTime(); virtual void attachTime();
virtual void separateEpilogue(); virtual void attachEpilogue();
virtual int setLineLength(int len); virtual int getLineLength() const;

// ----- Data affected by methods of the ELdestControl handle:
//
protected:
ELseverityLevel threshold;
ELseverityLevel traceThreshold;
Expand Down
10 changes: 0 additions & 10 deletions FWCore/MessageService/interface/ELoutput.h
View file
Expand Up @@ -39,17 +39,13 @@ namespace edm {
class ErrorObj;
namespace service {

class ELdestControl;


// ----------------------------------------------------------------------
// ELoutput:
// ----------------------------------------------------------------------

class ELoutput : public ELdestination {

friend class ELdestControl;

public:

// --- Birth/death:
Expand All @@ -65,17 +61,11 @@ class ELoutput : public ELdestination {
public:
virtual bool log( const edm::ErrorObj & msg ) override;

// --- Methods invoked through the ELdestControl handle:
//
protected:
// trivial clearSummary(), wipe(), zero() from base class
// trivial three summary(..) from base class

// --- Data affected by methods of specific ELdestControl handle:
//
protected:
// ELoutput uses the generic ELdestControl handle

// --- Internal Methods -- Users should not invoke these:
//
protected:
Expand Down
6 changes: 0 additions & 6 deletions FWCore/MessageService/interface/ELstatistics.h
View file
Expand Up @@ -44,7 +44,6 @@ namespace edm {
class ErrorObj;
namespace service {
class ELadministrator;
class ELdestControl;


// ----------------------------------------------------------------------
Expand All @@ -54,7 +53,6 @@ class ELdestControl;
class ELstatistics : public ELdestination {

friend class ELadministrator;
friend class ELdestControl;

public:
// ----- constructor/destructor:
Expand Down Expand Up @@ -89,8 +87,6 @@ class ELstatistics : public ELdestination {
void summaryForJobReport (std::map<std::string, double> & sm);
virtual void wipe() override;

// ----- Methods invoked through the ELdestControl handle:
//
protected:
void clearSummary();

Expand All @@ -103,8 +99,6 @@ class ELstatistics : public ELdestination {
// summarization( const ELstring & sumLines, const ELstring & sumLines )
// from base class

// ----- Data affected by methods of specific ELdestControl handle:
//
protected:
int tableLimit;
ELmap_stats stats;
Expand Down
6 changes: 3 additions & 3 deletions FWCore/MessageService/interface/MessageLoggerScribe.h
View file
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Utilities/interface/value_ptr.h"
#include "FWCore/Utilities/interface/propagate_const.h"

#include "FWCore/MessageService/interface/ELdestControl.h"
#include "FWCore/MessageService/interface/ELdestination.h"
#include "FWCore/MessageService/interface/MessageLoggerDefaults.h"
#include "FWCore/MessageLogger/interface/MessageLoggerQ.h"
#include "FWCore/MessageLogger/interface/AbstractMLscribe.h"
Expand Down Expand Up @@ -118,7 +118,7 @@ class MessageLoggerScribe : public AbstractMLscribe
void configure_errorlog( );
void configure_ordinary_destinations( ); // Change Log 3
void configure_statistics( ); // Change Log 3
void configure_dest( ELdestControl & dest_ctrl
void configure_dest( std::shared_ptr<ELdestination> dest_ctrl
, String const & filename
);

Expand Down Expand Up @@ -219,7 +219,7 @@ class MessageLoggerScribe : public AbstractMLscribe

// --- data:
edm::propagate_const<std::shared_ptr<ELadministrator>> admin_p;
ELdestControl early_dest;
std::shared_ptr<ELdestination> early_dest;
std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
std::map<String,edm::propagate_const<std::ostream*>> stream_ps;
Expand Down
6 changes: 3 additions & 3 deletions FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h
View file
Expand Up @@ -4,7 +4,7 @@
#include "FWCore/Utilities/interface/value_ptr.h"
#include "FWCore/Utilities/interface/propagate_const.h"

#include "FWCore/MessageService/interface/ELdestControl.h"
#include "FWCore/MessageService/interface/ELdestination.h"
#include "FWCore/MessageService/interface/MessageLoggerDefaults.h"
#include "FWCore/MessageLogger/interface/MessageLoggerQ.h"
#include "FWCore/MessageLogger/interface/AbstractMLscribe.h"
Expand Down Expand Up @@ -68,7 +68,7 @@ class ThreadSafeLogMessageLoggerScribe : public AbstractMLscribe
void configure_errorlog( );
void configure_ordinary_destinations( ); // Change Log 3
void configure_statistics( ); // Change Log 3
void configure_dest( ELdestControl & dest_ctrl
void configure_dest( std::shared_ptr<ELdestination> dest_ctrl
, String const & filename
);

Expand All @@ -95,7 +95,7 @@ class ThreadSafeLogMessageLoggerScribe : public AbstractMLscribe

// --- data:
edm::propagate_const<std::shared_ptr<ELadministrator>> admin_p;
ELdestControl early_dest;
std::shared_ptr<ELdestination> early_dest;
std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
std::map<String, edm::propagate_const<std::ostream*>> stream_ps;
Expand Down
6 changes: 3 additions & 3 deletions FWCore/MessageService/src/ELadministrator.cc
View file
Expand Up @@ -124,11 +124,11 @@ void ELadministrator::log(edm::ErrorObj & msg) {
// ELadministrator functionality:
// ----------------------------------------------------------------------

ELdestControl ELadministrator::attach( std::shared_ptr<ELdestination> sink ) {
std::shared_ptr<ELdestination> ELadministrator::attach( std::shared_ptr<ELdestination> sink ) {

sinks_.push_back( sink );
return ELdestControl( sink );

return sink;
} // attach()

ELseverityLevel ELadministrator::checkSeverity() {
Expand Down

0 comments on commit 613947a

Please sign in to comment.