spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

Minor bug fixes

Browse source
This commit is contained in:
balandi1 2019-12-04 14:08:17 -05:00
parent bedfa52d7a
commit c914161643
10 changed files with 108 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

35
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -22,9 +22,8 @@ func NewClsfnTaskDistrOverheadLogger(b *baseLogData, logType int, prefix string)
}
func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) {
if config.TaskDistrConfig.Enabled {
if cLog.Type == logType {
if cLog.Type == logType {
if config.TaskDistrConfig.Enabled {
if cLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Log(level, message)
@ -33,19 +32,19 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, messa
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Log(level, message)
}
if cLog.next != nil {
cLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
// Forwarding to next logger
if cLog.next != nil {
cLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.TaskDistrConfig.Enabled {
if cLog.Type == logType {
if cLog.Type == logType {
if config.TaskDistrConfig.Enabled {
if cLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
@ -54,12 +53,12 @@ func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgF
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
}
if cLog.next != nil {
cLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
if cLog.next != nil {
cLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
cLog.resetFields()
}
}

37
elektronLogging/consoleLogger.go
View file

@ -21,45 +21,44 @@ func NewConsoleLogger(b *baseLogData, logType int, prefix string) *ConsoleLogger
return cLog
}
func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
if config.ConsoleConfig.Enabled {
if logType <= cLog.Type {
if logType <= cLog.Type {
if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Log(level, message)
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Log(level, message)
}
if cLog.next != nil {
cLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
// Forwarding to next logger.
if cLog.next != nil {
cLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
func (cLog ConsoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.ConsoleConfig.Enabled {
if logType <= cLog.Type {
if logType <= cLog.Type {
if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
}
if cLog.next != nil {
cLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
if cLog.next != nil {
cLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
cLog.resetFields()
}
}
func (cLog *ConsoleLogger) CreateLogFile(prefix string) {
// Create log file for the type if it is enabled.
if config.ConsoleConfig.Enabled {
filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
dirName := logDir.getDirName()

3
elektronLogging/createLogDir.go
View file

@ -20,7 +20,8 @@ func (logD *logDirectory) getDirName() string {
func (logD *logDirectory) createLogDir(prefix string, startTime time.Time) {
if logD.name == "" {
// Creating directory to store all logs for this run. Directory name format - 2019-November-21_14-33-0.
// Creating directory to store all logs for this run. Directory name format : _2019-November-21_14-33-0.
prefix = prefix + "_"
logDirName := strings.Join([]string{"./", prefix, strconv.Itoa(startTime.Year())}, "")
logDirName = strings.Join([]string{logDirName, startTime.Month().String(), strconv.Itoa(startTime.Day())}, "-")
logDirName = strings.Join([]string{logDirName, strconv.Itoa(startTime.Hour())}, "_")

2
elektronLogging/logger.go
View file

@ -42,7 +42,7 @@ func BuildLogger(prefix string, logConfigFilename string) {
schedTraceLog := NewSchedTraceLogger(b, SCHED_TRACE, prefix)
spsLog := NewSchedPolicySwitchLogger(b, SPS, prefix)
schedWindowLog := NewSchedWindowLogger(b, SCHED_WINDOW, prefix)
tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDIST_OVERHEAD, prefix)
tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDISTR_OVERHEAD, prefix)
head.SetNext(cLog)
cLog.SetNext(pLog)

35
elektronLogging/pcpLogger.go
View file

@ -22,9 +22,8 @@ func NewPCPLogger(b *baseLogData, logType int, prefix string) *PCPLogger {
}
func (pLog PCPLogger) Log(logType int, level log.Level, message string) {
if config.PCPConfig.Enabled {
if pLog.Type == logType {
if pLog.Type == logType {
if config.PCPConfig.Enabled {
if pLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(pLog.data).Log(level, message)
@ -33,19 +32,18 @@ func (pLog PCPLogger) Log(logType int, level log.Level, message string) {
logger.SetOutput(pLog.LogFile)
logger.WithFields(pLog.data).Log(level, message)
}
if pLog.next != nil {
pLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
pLog.resetFields()
}
}
if pLog.next != nil {
pLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
pLog.resetFields()
}
}
func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.PCPConfig.Enabled {
if pLog.Type == logType {
if pLog.Type == logType {
if config.PCPConfig.Enabled {
if pLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
@ -54,12 +52,13 @@ func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, ar
logger.SetOutput(pLog.LogFile)
logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
}
if pLog.next != nil {
pLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
pLog.resetFields()
}
}
// Forwarding to next logger
if pLog.next != nil {
pLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
pLog.resetFields()
}
}

35
elektronLogging/schedPolicySwitchLogger.go
View file

@ -22,9 +22,8 @@ func NewSchedPolicySwitchLogger(b *baseLogData, logType int, prefix string) *Sch
}
func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message string) {
if config.SPSConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SPSConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message)
@ -33,19 +32,18 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message st
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Log(level, message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.SPSConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SPSConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
@ -54,12 +52,13 @@ func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtStr
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
}
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
// Forwarding to next logger
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}

35
elektronLogging/schedTraceLogger.go
View file

@ -22,9 +22,8 @@ func NewSchedTraceLogger(b *baseLogData, logType int, prefix string) *SchedTrace
}
func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) {
if config.SchedTraceConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SchedTraceConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message)
@ -33,19 +32,18 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) {
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Log(level, message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.SchedTraceConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SchedTraceConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
@ -54,12 +52,13 @@ func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString str
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
}
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
// Forwarding to next logger
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}

35
elektronLogging/schedWindowLogger.go
View file

@ -22,9 +22,8 @@ func NewSchedWindowLogger(b *baseLogData, logType int, prefix string) *SchedWind
}
func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string) {
if config.SchedWindowConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SchedWindowConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message)
@ -33,19 +32,19 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string)
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Log(level, message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
// Forwarding to next logger
if sLog.next != nil {
sLog.next.Log(logType, level, message)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if config.SchedWindowConfig.Enabled {
if sLog.Type == logType {
if sLog.Type == logType {
if config.SchedWindowConfig.Enabled {
if sLog.AllowOnConsole {
logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
@ -54,12 +53,12 @@ func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString st
logger.SetOutput(sLog.LogFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
}
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}
if sLog.next != nil {
sLog.next.Logf(logType, level, msgFmtString, args...)
} else {
// Clearing the fields.
sLog.resetFields()
}
}

2
elektronLogging/types/types.go
View file

@ -6,5 +6,5 @@ const (
SCHED_TRACE
SPS
SCHED_WINDOW
CLSFN_TASKDIST_OVERHEAD
CLSFN_TASKDISTR_OVERHEAD
)

2
schedulers/base.go
View file

@ -375,5 +375,5 @@ func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicy
func (s *BaseScheduler) LogClsfnAndTaskDistOverhead(overhead time.Duration) {
// Logging the overhead in microseconds.
elekLog.ElektronLogger.WithFields(log.Fields{"Overhead in microseconds": fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}).Log(elekLogTypes.CLSFN_TASKDIST_OVERHEAD, log.InfoLevel, "")
elekLog.ElektronLogger.WithFields(log.Fields{"Overhead in microseconds": fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}).Log(elekLogTypes.CLSFN_TASKDISTR_OVERHEAD, log.InfoLevel, "")
}