Skip to content
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

Add loggers for generic stages #1510

Merged
merged 2 commits into from
May 17, 2022
Merged

Add loggers for generic stages #1510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
282e883
Add loggers for generic stages
mathomp4 May 16, 2022
5860d30
Merge branch 'develop' into feature/mathomp4/loggers-for-stages
mathomp4 May 16, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Add debug loggers for start/stop during stages in MAPL_Generic

### Changed

### Removed
Expand Down
60 changes: 37 additions & 23 deletions generic/MAPL_Generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,10 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC)
procedure(ESMF_GridCompRun), pointer :: func_ptr => NULL()
character(len=12), target :: timers_run(1) = &
[character(len=12):: 'GenRunMine']
character(len=12) :: sbrtn
character(len=:), allocatable :: sbrtn

character(:), allocatable :: stage_description
class(Logger), pointer :: lgr


!=============================================================================
Expand All @@ -1726,6 +1729,8 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC)
_VERIFY(status)
Iam = trim(comp_name) // trim(Iam)

lgr => logging%get_logger('MAPL.GENERIC')

call ESMF_VmGetCurrent(VM)
! Retrieve the pointer to the internal state. It comes in a wrapper.
! ------------------------------------------------------------------
Expand All @@ -1735,7 +1740,7 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC)

! TIMERS on
t_p => get_global_time_profiler()
call t_p%start(trim(state%compname),__RC__)
call t_p%start(trim(state%compname),_RC)

phase_ = MAPL_MAX_PHASES+phase ! this is the "actual" phase, i.e. the one user registered

Expand Down Expand Up @@ -1770,10 +1775,12 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC)
sbrtn = 'WriteRestart'
endif MethodBlock

stage_description = sbrtn//' stage of the gridded component <'//trim(COMP_NAME)//'>'

! TIMERS on
if (method /= ESMF_METHOD_READRESTART .and. method /= ESMF_METHOD_WRITERESTART) then
call state%t_profiler%start(__RC__)
call state%t_profiler%start(trim(sbrtn),__RC__)
call state%t_profiler%start(_RC)
call state%t_profiler%start(trim(sbrtn),_RC)
end if

if (associated(timers)) then
Expand All @@ -1784,34 +1791,32 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC)

! Method itself
! ----------
#ifdef DEBUG
IF (mapl_am_i_root(vm)) then
print *,'DBG: running ', sbrtn, ' phase ',phase,' of ',trim(comp_name)
end IF
#endif

call lgr%debug('Started %a', stage_description)

call func_ptr (GC, &
importState=IMPORT, &
exportState=EXPORT, &
clock=CLOCK, PHASE=PHASE_, &
userRC=userRC, __RC__ )
userRC=userRC, _RC )
_VERIFY(userRC)

_ASSERT(userRC==ESMF_SUCCESS .and. STATUS==ESMF_SUCCESS,'Error during '//stage_description//' for <'//trim(COMP_NAME)//'>')
call lgr%debug('Finished %a', stage_description)

! TIMERS off
if (associated(timers)) then
do i = size(timers),1,-1
call MAPL_TimerOff (STATE,timers(i),__RC__)
call MAPL_TimerOff (STATE,timers(i),_RC)
end do
end if

if (method /= ESMF_METHOD_FINALIZE) then
if (method /= ESMF_METHOD_WRITERESTART .and. &
method /= ESMF_METHOD_READRESTART) then
call state%t_profiler%stop(trim(sbrtn),__RC__)
call state%t_profiler%stop(__RC__)
call state%t_profiler%stop(trim(sbrtn),_RC)
call state%t_profiler%stop(_RC)
end if
call t_p%stop(trim(state%compname),__RC__)
call t_p%stop(trim(state%compname),_RC)
endif


Expand Down Expand Up @@ -4553,6 +4558,9 @@ recursive integer function AddChildFromMeta(META, NAME, GRID, &
class(BaseProfiler), pointer :: t_p
integer :: userRC

character(:), allocatable :: stage_description
class(Logger), pointer :: lgr

if (.not.allocated(META%GCNameList)) then
! this is the first child to be added
allocate(META%GCNameList(0), __STAT__)
Expand All @@ -4561,19 +4569,25 @@ recursive integer function AddChildFromMeta(META, NAME, GRID, &
I = META%get_num_children() + 1
AddChildFromMeta = I

call AddChild_preamble(meta, I, name, grid=grid, configfile=configfile, parentGC=parentgc, petList=petlist, child_meta=child_meta, __RC__)
call AddChild_preamble(meta, I, name, grid=grid, configfile=configfile, parentGC=parentgc, petList=petlist, child_meta=child_meta, _RC)

stage_description = 'setServices() of the gridded component <'//trim(name)//'>'
lgr => logging%get_logger('MAPL.GENERIC')

t_p => get_global_time_profiler()
call t_p%start(trim(NAME),__RC__)
call child_meta%t_profiler%start(__RC__)
call child_meta%t_profiler%start('SetService',__RC__)
call t_p%start(trim(NAME),_RC)
call child_meta%t_profiler%start(_RC)
call child_meta%t_profiler%start('SetService',_RC)

!!$ gridcomp => META%GET_CHILD_GRIDCOMP(I)
call ESMF_GridCompSetServices ( child_meta%gridcomp, SS, userRC=userRC, __RC__ )
call lgr%debug("Started %a", stage_description)
call ESMF_GridCompSetServices ( child_meta%gridcomp, SS, userRC=userRC, _RC )
_VERIFY(userRC)
call lgr%debug("Finished %a", stage_description)

call child_meta%t_profiler%stop('SetService',__RC__)
call child_meta%t_profiler%stop(__RC__)
call t_p%stop(trim(NAME),__RC__)
call child_meta%t_profiler%stop('SetService',_RC)
call child_meta%t_profiler%stop(_RC)
call t_p%stop(trim(NAME),_RC)

_VERIFY(status)

Expand Down