Save/restore extra tags when reloading modules

Update reloadModuleListUnloadPhase and reloadModuleListLoadPhase
procedures to save extra tags of unloaded modules to re-inject them when
reloading these modules.

Author: xdelaruelle

tcl/modeval.tcl

@@ -678,6 +678,8 @@ proc reloadModuleListUnloadPhase {lmname {force 0} {errmsgtpl {}} {context\
       set isuasked($mod) [isModuleTagged $mod loaded 1]
       # save variants set for modules
       set vr($mod) [getVariantList $mod 1 2]
+      # save extra tags set
+      set extratag($mod) [getExtraTagList $mod]
       # force unload even if requiring mods are not part of the unload list
       # (violation state) as modules are loaded again just after
       if {[cmdModuleUnload $context match 0 1 0 0 $mod]} {
@@ -699,15 +701,16 @@ proc reloadModuleListUnloadPhase {lmname {force 0} {errmsgtpl {}} {context\
       lpopState reloading_sticky
       lpopState reloading_supersticky
    }
-   return [list [array get isuasked] [array get vr]]
+   return [list [array get isuasked] [array get vr] [array get extratag]]
 }
 
 # load phase of a list of modules reload process
-proc reloadModuleListLoadPhase {lmname isuaskedlist vrlist {force 0}\
-   {errmsgtpl {}} {context load}} {
+proc reloadModuleListLoadPhase {lmname isuaskedlist vrlist extrataglist\
+   {force 0} {errmsgtpl {}} {context load}} {
    upvar $lmname lmlist
    array set isuasked $isuaskedlist
    array set vr $vrlist
+   array set extratag $extrataglist
 
    # loads are made with auto handling mode disabled to avoid disturbances
    # from a missing prereq automatically reloaded, so these module loads may
@@ -716,8 +719,9 @@ proc reloadModuleListLoadPhase {lmname isuaskedlist vrlist {force 0}\
    foreach mod $lmlist {
       # if an auto set default was excluded, module spec need parsing
       lassign [parseModuleSpecification 0 $mod {*}$vr($mod)] modnamevr
-      # reload module with user asked property preserved
-      if {[cmdModuleLoad $context $isuasked($mod) {} $modnamevr]} {
+      # reload module with user asked property and extra tags preserved
+      if {[cmdModuleLoad $context $isuasked($mod) $extratag($mod)\
+         $modnamevr]} {
          set errMsg [string map [list _MOD_ [getModuleDesignation spec\
             $modnamevr]] $errmsgtpl]
          if {$force} {

tcl/subcmd.tcl.in

@@ -473,13 +473,15 @@ proc cmdModuleSwitch {uasked tag_list old {new {}}} {
       if {[info exists depreisuasked]} {
          set undepreisuasked $depreisuasked
          set undeprevr $deprevr
+         set undepreextratag $depreextratag
       }
       cmdModuleLoad swload $uasked $tag_list $new
 
       # merge depre info of unload and load phases
       if {[info exists undepreisuasked]} {
          set depreisuasked [list {*}$undepreisuasked {*}$depreisuasked]
          set deprevr [list {*}$undeprevr {*}$deprevr]
+         set depreextratag [list {*}$undepreextratag {*}$depreextratag]
       }
 
       if {[getConf auto_handling] && [info exists deprelist] && [llength\
@@ -490,7 +492,7 @@ proc cmdModuleSwitch {uasked tag_list old {new {}}} {
          # for the load phase of the DepRe mechanism.
          # Try DepRe load phase: load failure will not lead to switch failure
          reloadModuleListLoadPhase deprelist $depreisuasked $deprevr\
-            1 {Reload of dependent _MOD_ failed} depre
+            $depreextratag 1 {Reload of dependent _MOD_ failed} depre
       }
 
       # report a summary of automated evaluations if no error
@@ -873,6 +875,7 @@ proc cmdModuleLoad {context uasked tag_list args} {
          upvar deprelist swdeprelist
          upvar depreisuasked depreisuasked
          upvar deprevr deprevr
+         upvar depreextratag depreextratag
 
          # transmit loaded mod name for switch report summary
          uplevel 1 set new "{$modnamevr}"
@@ -949,7 +952,7 @@ proc cmdModuleLoad {context uasked tag_list args} {
             if {[llength $deprelist] > 0} {
                lassign [reloadModuleListUnloadPhase deprelist [getState\
                   force] {Unload of dependent _MOD_ failed} depun]\
-                  depreisuasked deprevr
+                  depreisuasked deprevr depreextratag
                if {[info exists swprocessing]} {
                   if {[info exists swdeprelist]} {
                      set swdeprelist [list {*}$deprelist {*}$swdeprelist]
@@ -1109,7 +1112,8 @@ proc cmdModuleLoad {context uasked tag_list args} {
          if {[getConf auto_handling] && [llength $deprelist] > 0 && ![info\
             exists swprocessing]} {
             reloadModuleListLoadPhase deprelist $depreisuasked $deprevr\
-               [getState force] {Reload of dependent _MOD_ failed} depre
+               $depreextratag [getState force] {Reload of dependent _MOD_\
+               failed} depre
          }
 
          # consider evaluation hidden if hidden loaded module is auto loaded
@@ -1207,6 +1211,7 @@ proc cmdModuleUnload {context match auto force onlyureq onlyndep args} {
          upvar deprelist deprelist
          upvar depreisuasked depreisuasked
          upvar deprevr deprevr
+         upvar depreextratag depreextratag
 
          # transmit unloaded mod name for switch report summary
          uplevel 1 set old "{$modnamevr}"
@@ -1338,7 +1343,7 @@ proc cmdModuleUnload {context match auto force onlyureq onlyndep args} {
             if {[llength $deprelist] > 0} {
                lassign [reloadModuleListUnloadPhase deprelist [getState\
                   force] {Unload of dependent _MOD_ failed} depun]\
-                  depreisuasked deprevr
+                  depreisuasked deprevr depreextratag
             }
 
             # DepUn modules unload prior main mod unload
@@ -1455,7 +1460,8 @@ proc cmdModuleUnload {context match auto force onlyureq onlyndep args} {
             # will occur after the new mod load
             if {[llength $deprelist] > 0 && ![info exists swprocessing]} {
                reloadModuleListLoadPhase deprelist $depreisuasked $deprevr\
-                  [getState force] {Reload of dependent _MOD_ failed} depre
+                  $depreextratag [getState force] {Reload of dependent _MOD_\
+                  failed} depre
             }
          }
 
@@ -1536,8 +1542,8 @@ proc cmdModuleReload {args} {
       pushSettings
       if {[set errCode [catch {
          # run unload then load-again phases
-         lassign [reloadModuleListUnloadPhase lmlist] isuasked vr
-         reloadModuleListLoadPhase lmlist $isuasked $vr
+         lassign [reloadModuleListUnloadPhase lmlist] isuasked vr extratag
+         reloadModuleListLoadPhase lmlist $isuasked $vr $extratag
       } errMsg]] == 1} {
          # rollback settings if some evaluation went wrong
          restoreSettings

testsuite/modules.50-cmds/377-error.exp

@@ -62,7 +62,8 @@ lappend ans [list set __MODULES_LMCONFLICT rd&rf]
 lappend ans [list set __MODULES_LMPREREQ rd&ra|rb:rc&rb]
 lappend ans [list set _LMFILES_ $mp/rb:$mp/rd:$mp/rc]
 lappend ans [list set LOADEDMODULES rb:rd:rc]
-lappend ans [list set __MODULES_LMTAG rb&auto-loaded:rd&auto-loaded]
+#FIXME duplicate tag entry for rd
+lappend ans [list set __MODULES_LMTAG rd&auto-loaded:rb&auto-loaded:rd&auto-loaded]
 lappend ans [list ERR]
 set tserr [list {unload rd} {load ra} \n[msg_load ra $err_evalabort]\n {load rc} {unload rd} {load rb} {load rd} \n[msg_top_load rc {} rb rd]]
 testouterr_cmd_re sh {load ra rc} $ans [join $tserr \n]

testsuite/modules.50-cmds/450-hidden-loaded.exp

@@ -89,7 +89,7 @@ set ans [list]
 lappend ans [list set __MODULES_LMPREREQ h2&h1:h4&h1&h2|h3]
 lappend ans [list set _LMFILES_ $mp/h1:$mp/h2:$mp/h3:$mp/h4]
 lappend ans [list set LOADEDMODULES h1:h2:h3:h4]
-lappend ans [list set __MODULES_LMTAG h1&auto-loaded&hidden-loaded:h2&auto-loaded:h3&hidden-loaded]
+lappend ans [list set __MODULES_LMTAG h1&hidden-loaded&auto-loaded:h2&auto-loaded:h3&hidden-loaded]
 testouterr_cmd_re sh {reload -v} $ans [msg_unload h4]\n[msg_unload h3]\n[msg_unload h2]\n[msg_load h2]\n[msg_load h3]\n[msg_load h4]
 unsetenv_loaded_module
 unsetenv_var __MODULES_LMPREREQ

testsuite/modules.50-cmds/465-tag-opt.exp

@@ -1025,6 +1025,12 @@ setenv_path_var __MODULES_LMPREREQ $mod&foo/1.0
 setenv_path_var __MODULES_LMEXTRATAG foo/1.0&foo
 setenv_path_var __MODULES_LMTAG foo/1.0&foo&keep-loaded&auto-loaded
 
+set ans [list]
+lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0]
+lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
+lappend ans [list set LOADEDMODULES foo/1.0:$mod]
+lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&foo]
+lappend ans [list set __MODULES_LMTAG foo/1.0&foo&auto-loaded&keep-loaded]
 testouterr_cmd sh {reload} $ans {}
 
 setenv_path_var __MODULES_LMEXTRATAG foo/1.0&foo:$mod&bar
@@ -1035,7 +1041,7 @@ lappend ans [list set __MODULES_LMPREREQ $mod&foo/1.0]
 lappend ans [list set _LMFILES_ $mp/foo/1.0:$modfile]
 lappend ans [list set LOADEDMODULES foo/1.0:$mod]
 lappend ans [list set __MODULES_LMEXTRATAG foo/1.0&foo:$mod&bar]
-lappend ans [list set __MODULES_LMTAG foo/1.0&foo&keep-loaded&auto-loaded:$mod&bar]
+lappend ans [list set __MODULES_LMTAG foo/1.0&foo&auto-loaded&keep-loaded:$mod&bar]
 testouterr_cmd sh {reload} $ans {}
 
 unsetenv_loaded_module