Skip to content

Commit

Permalink
Revert "simpify caller inlining"
Browse files Browse the repository at this point in the history 
This reverts commit 75b2656.
  • Loading branch information
@phuslu
phuslu committed May 1, 2024
1 parent 75b2656 commit a49f68f
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
114 changes: 57 additions & 57 deletions logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ func Trace() (e *Entry) {
return nil
}
e = DefaultLogger.header(TraceLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -140,12 +140,12 @@ func Debug() (e *Entry) {
return nil
}
e = DefaultLogger.header(DebugLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -156,12 +156,12 @@ func Info() (e *Entry) {
return nil
}
e = DefaultLogger.header(InfoLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -172,12 +172,12 @@ func Warn() (e *Entry) {
return nil
}
e = DefaultLogger.header(WarnLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -188,12 +188,12 @@ func Error() (e *Entry) {
return nil
}
e = DefaultLogger.header(ErrorLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -204,12 +204,12 @@ func Fatal() (e *Entry) {
return nil
}
e = DefaultLogger.header(FatalLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -220,25 +220,25 @@ func Panic() (e *Entry) {
return nil
}
e = DefaultLogger.header(PanicLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}

// Printf sends a log entry without extra field. Arguments are handled in the manner of fmt.Printf.
func Printf(format string, v ...interface{}) {
e := DefaultLogger.header(noLevel)
if caller := DefaultLogger.Caller; caller != 0 {
if caller, full := DefaultLogger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, DefaultLogger.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
e.Msgf(format, v...)
}
Expand All @@ -249,12 +249,12 @@ func (l *Logger) Trace() (e *Entry) {
return nil
}
e = l.header(TraceLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -265,12 +265,12 @@ func (l *Logger) Debug() (e *Entry) {
return nil
}
e = l.header(DebugLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -281,12 +281,12 @@ func (l *Logger) Info() (e *Entry) {
return nil
}
e = l.header(InfoLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -297,12 +297,12 @@ func (l *Logger) Warn() (e *Entry) {
return nil
}
e = l.header(WarnLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -313,12 +313,12 @@ func (l *Logger) Error() (e *Entry) {
return nil
}
e = l.header(ErrorLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -329,12 +329,12 @@ func (l *Logger) Fatal() (e *Entry) {
return nil
}
e = l.header(FatalLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -345,25 +345,25 @@ func (l *Logger) Panic() (e *Entry) {
return nil
}
e = l.header(PanicLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}

// Log starts a new message with no level.
func (l *Logger) Log() (e *Entry) {
e = l.header(noLevel)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -374,12 +374,12 @@ func (l *Logger) WithLevel(level Level) (e *Entry) {
return nil
}
e = l.header(level)
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -400,12 +400,12 @@ func (l *Logger) Err(err error) (e *Entry) {
if level == ErrorLevel {
e = e.Err(err)
}
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
return
}
Expand All @@ -419,12 +419,12 @@ func (l *Logger) SetLevel(level Level) {
func (l *Logger) Printf(format string, v ...interface{}) {
e := l.header(noLevel)
if e != nil {
if caller := l.Caller; caller != 0 {
if caller, full := l.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller, &pc, 1, 1), pc, l.Caller < 0)
e.caller(caller1(caller, &pc, 1, 1), pc, full)
}
}
e.Msgf(format, v...)
Expand Down
6 changes: 3 additions & 3 deletions logger_std.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ func (w *stdLogWriter) Write(p []byte) (int, error) {
return 0, nil
}
e := w.Logger.header(w.Level)
if caller := w.Logger.Caller; caller != 0 {
if caller, full := w.Logger.Caller, false; caller != 0 {
if caller < 0 {
caller = -caller
caller, full = -caller, true
}
var pc uintptr
e.caller(caller1(caller+2, &pc, 1, 1), pc, w.Logger.Caller < 0)
e.caller(caller1(caller+2, &pc, 1, 1), pc, full)
}
e.Msg(b2s(p))
return len(p), nil
Expand Down

0 comments on commit a49f68f

Please sign in to comment.