Skip to content

Logger: move self%buffer and seld%len_buffer to local variables #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 28, 2020
Merged

Logger: move self%buffer and seld%len_buffer to local variables #253

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49bb9d9
mv self%buffer and seld%len_buffer to local variables (inside subrout…
jvdp1 Nov 26, 2020
6ca6e73
Apply suggestions from code review
jvdp1 Nov 27, 2020
50dec22
moved self , intent(inout) to self intent(in) as suggested in the review
jvdp1 Nov 27, 2020
9dcb787
specs adapted: remove "buffer" and "len_buffer" and the intents of se…
jvdp1 Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 80 additions & 76 deletions src/stdlib_logger.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ module stdlib_logger
private

logical :: add_blank_line = .false.
character(:), allocatable :: buffer
logical :: indent_lines = .true.
integer :: len_buffer = 0
integer, allocatable :: log_units(:)
integer :: max_width = 0
logical :: time_stamp = .true.
Expand Down Expand Up @@ -517,22 +515,24 @@ subroutine final_logger( self )
end subroutine final_logger


subroutine format_output_string( self, string, col_indent )
subroutine format_output_string( self, string, col_indent, len_buffer, buffer )
!! version: experimental

!! Writes the STRING to UNIT ensuring that the number of characters
!! does not exceed MAX_WIDTH and that the lines after the first
!! one are indented four characters.
class(logger_type), intent(inout) :: self
character(*), intent(in) :: string
character(*), intent(in) :: col_indent
class(logger_type), intent(inout) :: self
integer, intent(out) :: len_buffer
character(*), intent(in) :: string
character(*), intent(in) :: col_indent
character(len=:), allocatable, intent(out) :: buffer

integer :: count, indent_len, index_, length, remain
integer, parameter :: new_len = len(new_line('a'))

length = len_trim(string)
allocate( character(2*length) :: self % buffer )
self % len_buffer = 0
allocate( character(2*length) :: buffer )
len_buffer = 0
indent_len = len(col_indent)
call format_first_line()

Expand All @@ -553,8 +553,8 @@ subroutine format_first_line()
if ( self % max_width == 0 .or. &
( length <= self % max_width .and. &
index( string(1:length), new_line('a')) == 0 ) ) then
self % buffer(1:length) = string(1:length)
self % len_buffer = length
buffer(1:length) = string(1:length)
len_buffer = length
remain = 0
return
else
Expand All @@ -568,15 +568,15 @@ subroutine format_first_line()
end if

if ( index_ == 0 ) then
self % buffer(1:self % max_width) = &
buffer(1:self % max_width) = &
string(1:self % max_width)
self % len_buffer = self % max_width
len_buffer = self % max_width
count = self % max_width
remain = length - count
return
else
self % buffer(1:index_-1) = string(1:index_-1)
self % len_buffer = index_-1
buffer(1:index_-1) = string(1:index_-1)
len_buffer = index_-1
count = index_
remain = length - count
return
Expand All @@ -591,15 +591,15 @@ subroutine format_subsequent_line()
character(:), allocatable :: dummy

if ( remain <= self % max_width ) then
new_len_buffer = self % len_buffer + length - count + new_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
new_len_buffer = len_buffer + length - count + new_len
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1:new_len_buffer ) = &
buffer( len_buffer+1:new_len_buffer ) = &
new_line('a') // string(count+1:length)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = length
remain = 0
return
Expand All @@ -614,30 +614,30 @@ subroutine format_subsequent_line()
end if

if ( index_ == count ) then
new_len_buffer = self % len_buffer + self % max_width + &
new_len_buffer = len_buffer + self % max_width + &
new_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1:new_len_buffer ) = &
buffer( len_buffer+1:new_len_buffer ) = &
new_line('a') // string(count+1:count+self % max_width)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = count + self % max_width
remain = length - count
return
else
new_len_buffer = self % len_buffer + index_ - 1 &
new_len_buffer = len_buffer + index_ - 1 &
- count + new_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1:new_len_buffer ) = &
buffer( len_buffer+1:new_len_buffer ) = &
new_line('a') // string(count+1:index_-1)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = index_
remain = length - count
return
Expand All @@ -653,16 +653,16 @@ subroutine indent_format_subsequent_line()

if ( index( string(count+1:length), new_line('a')) == 0 .and. &
remain <= self % max_width - indent_len ) then
new_len_buffer = self % len_buffer + length &
new_len_buffer = len_buffer + length &
- count + new_len + indent_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1:new_len_buffer ) = &
buffer( len_buffer+1:new_len_buffer ) = &
new_line('a') // col_indent // string(count+1:length)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = length
remain = 0
return
Expand All @@ -678,31 +678,31 @@ subroutine indent_format_subsequent_line()
end if

if ( index_ == count ) then
new_len_buffer = self % len_buffer + self % max_width &
new_len_buffer = len_buffer + self % max_width &
+ new_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1: new_len_buffer ) = &
buffer( len_buffer+1: new_len_buffer ) = &
new_line('a') // col_indent // &
string(count+1:count+self % max_width-indent_len)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = count + self % max_width - indent_len
remain = length - count
return
else
new_len_buffer = self % len_buffer + index_ - count - 1 &
new_len_buffer = len_buffer + index_ - count - 1 &
+ new_len + indent_len
if ( new_len_buffer > len( self % buffer ) ) then
allocate( character( 2*len( self % buffer ) ) :: dummy )
dummy = self % buffer
call move_alloc( dummy, self % buffer )
if ( new_len_buffer > len( buffer ) ) then
allocate( character( 2*len( buffer ) ) :: dummy )
dummy = buffer
call move_alloc( dummy, buffer )
end if
self % buffer( self % len_buffer+1: new_len_buffer ) = &
buffer( len_buffer+1: new_len_buffer ) = &
new_line('a') // col_indent // string(count+1:index_-1)
self % len_buffer = new_len_buffer
len_buffer = new_len_buffer
count = index_
remain = length - count
return
Expand Down Expand Up @@ -1040,9 +1040,11 @@ subroutine log_message( self, message, module, procedure, prefix )

integer :: unit
integer :: iostat
integer :: len_buffer
character(*), parameter :: procedure_name = 'log_message'
character(256) :: iomsg
character(:), allocatable :: d_and_t, m_and_p, pref
character(:), allocatable :: buffer

if ( present(prefix) ) then
pref = prefix // ': '
Expand Down Expand Up @@ -1071,36 +1073,38 @@ subroutine log_message( self, message, module, procedure, prefix )
call format_output_string( self, &
d_and_t // m_and_p // pref // &
trim( message ), &
' ' )
' ', &
len_buffer, &
buffer)

if ( self % units == 0 ) then
if ( self % add_blank_line ) then
write( output_unit, '(a)', err=999, iostat=iostat, &
iomsg=iomsg) &
new_line('a') // self % buffer(1:self % len_buffer)
new_line('a') // buffer(1:len_buffer)
else
write( output_unit, '(a)', err=999, iostat=iostat, &
iomsg=iomsg ) &
self % buffer(1:self % len_buffer)
buffer(1:len_buffer)
end if
else
if ( self % add_blank_line ) then
do unit=1, self % units
write( self % log_units(unit), '(a)', err=999, iostat=iostat, &
iomsg=iomsg ) new_line('a') // &
self % buffer(1:self % len_buffer)
buffer(1:len_buffer)
end do
else
do unit=1, self % units
write( self % log_units(unit), '(a)', err=999, iostat=iostat, &
iomsg=iomsg ) &
self % buffer(1:self % len_buffer)
buffer(1:len_buffer)
end do
end if
end if

deallocate( self % buffer )
self % len_buffer = 0
deallocate( buffer )
len_buffer = 0

return

Expand Down Expand Up @@ -1169,11 +1173,12 @@ subroutine log_text_error( self, line, column, summary, filename, &
!! greater than `len(line)`, and `write_failure` if any of the `write`
!! statements has failed.

character(1) :: acaret
character(128) :: iomsg
integer :: iostat
integer :: lun
character(*), parameter :: procedure_name = 'LOG_TEXT_ERROR'
character(1) :: acaret
character(128) :: iomsg
integer :: iostat
integer :: lun
character(*), parameter :: procedure_name = 'LOG_TEXT_ERROR'
character(len=:), allocatable :: buffer

acaret = optval(caret, '^')

Expand All @@ -1192,14 +1197,13 @@ subroutine log_text_error( self, line, column, summary, filename, &

call write_log_text_error_buffer( )
if ( self % units == 0 ) then
write( output_unit, '(a)' ) self % buffer
write( output_unit, '(a)' ) buffer
else
do lun=1, self % units
write( self % log_units(lun), '(a)' ) self % buffer
write( self % log_units(lun), '(a)' ) buffer
end do
end if
deallocate( self % buffer )
self % len_buffer = 0
deallocate( buffer )

contains

Expand Down Expand Up @@ -1243,26 +1247,26 @@ subroutine write_log_text_error_buffer( )
marker(column:column) = acaret
if ( self % add_blank_line ) then
if ( self % time_stamp ) then
self % buffer = new_line('a') // time_stamp() // &
buffer = new_line('a') // time_stamp() // &
new_line('a') // trim(location) // &
new_line('a') // new_line('a') // trim(line) // &
new_line('a') // marker // &
new_line('a') // 'Error: ' // trim(summary)
else
self % buffer = new_line('a') // trim(location) // &
buffer = new_line('a') // trim(location) // &
new_line('a') // new_line('a') // trim(line) // &
new_line('a') // marker // &
new_line('a') // 'Error: ' // trim(summary)
end if
else
if ( self % time_stamp ) then
self % buffer = time_stamp() // &
buffer = time_stamp() // &
new_line('a') // trim(location) // &
new_line('a') // new_line('a') // trim(line) // &
new_line('a') // marker // &
new_line('a') // 'Error: ' // trim(summary)
else
self % buffer = trim(location) // &
buffer = trim(location) // &
new_line('a') // new_line('a') // trim(line) // &
new_line('a') // marker // &
new_line('a') // 'Error: ' // trim(summary)
Expand Down