Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
190d69ef
Commit
190d69ef
authored
13 years ago
by
Danny Auble
Browse files
Options
Downloads
Patches
Plain Diff
BGQ - change from using the location string to figure out the midplane
to use the coordinates instead (much faster).
parent
4461a249
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/select/bluegene/bl_bgq/bridge_status.cc
+26
-8
26 additions, 8 deletions
src/plugins/select/bluegene/bl_bgq/bridge_status.cc
with
26 additions
and
8 deletions
src/plugins/select/bluegene/bl_bgq/bridge_status.cc
+
26
−
8
View file @
190d69ef
...
@@ -302,14 +302,22 @@ void event_handler::handleMidplaneStateChangedRealtimeEvent(
...
@@ -302,14 +302,22 @@ void event_handler::handleMidplaneStateChangedRealtimeEvent(
void
event_handler
::
handleSwitchStateChangedRealtimeEvent
(
void
event_handler
::
handleSwitchStateChangedRealtimeEvent
(
const
SwitchStateChangedEventInfo
&
event
)
const
SwitchStateChangedEventInfo
&
event
)
{
{
const
char
*
mp_name
=
event
.
getMidplaneLocation
().
c_str
();
Coordinates
ibm_coords
=
event
.
getMidplaneCoordinates
();
int
dim
=
event
.
getDimension
();
uint16_t
coords
[
SYSTEM_DIMENSIONS
];
ba_mp_t
*
ba_mp
=
loc2ba_mp
(
mp_name
);
int
dim
;
ba_mp_t
*
ba_mp
;
for
(
dim
=
0
;
dim
<
SYSTEM_DIMENSIONS
;
dim
++
)
coords
[
dim
]
=
ibm_coords
[
dim
];
dim
=
event
.
getDimension
();
ba_mp
=
coord2ba_mp
(
coords
);
if
(
!
ba_mp
)
{
if
(
!
ba_mp
)
{
error
(
"Switch in dim '%d' on Midplane %s, state "
error
(
"Switch in dim '%d' on Midplane %s, state "
"went from %d to %d, but is not in our system"
,
"went from %d to %d, but is not in our system"
,
dim
,
mp_name
,
dim
,
event
.
getMidplaneLocation
().
c_str
()
,
event
.
getPreviousState
(),
event
.
getPreviousState
(),
event
.
getState
());
event
.
getState
());
}
}
...
@@ -318,9 +326,10 @@ void event_handler::handleSwitchStateChangedRealtimeEvent(
...
@@ -318,9 +326,10 @@ void event_handler::handleSwitchStateChangedRealtimeEvent(
/* Don't do anything, wait for admin to fix things,
/* Don't do anything, wait for admin to fix things,
* just note things are better. */
* just note things are better. */
info
(
"Switch in dim '%u' on Midplane %s, "
info
(
"Switch in dim '%u' on Midplane %s
(%s)
, "
"has returned to service"
,
"has returned to service"
,
dim
,
mp_name
);
dim
,
event
.
getMidplaneLocation
().
c_str
(),
ba_mp
->
coord_str
);
return
;
return
;
}
}
...
@@ -335,7 +344,15 @@ void event_handler::handleNodeBoardStateChangedRealtimeEvent(
...
@@ -335,7 +344,15 @@ void event_handler::handleNodeBoardStateChangedRealtimeEvent(
{
{
const
char
*
mp_name
=
event
.
getLocation
().
substr
(
0
,
6
).
c_str
();
const
char
*
mp_name
=
event
.
getLocation
().
substr
(
0
,
6
).
c_str
();
const
char
*
nb_name
=
event
.
getLocation
().
substr
(
7
,
3
).
c_str
();
const
char
*
nb_name
=
event
.
getLocation
().
substr
(
7
,
3
).
c_str
();
ba_mp_t
*
ba_mp
=
loc2ba_mp
(
mp_name
);
Coordinates
ibm_coords
=
event
.
getMidplaneCoordinates
();
uint16_t
coords
[
SYSTEM_DIMENSIONS
];
int
dim
;
ba_mp_t
*
ba_mp
;
for
(
dim
=
0
;
dim
<
SYSTEM_DIMENSIONS
;
dim
++
)
coords
[
dim
]
=
ibm_coords
[
dim
];
ba_mp
=
coord2ba_mp
(
coords
);
if
(
!
ba_mp
)
{
if
(
!
ba_mp
)
{
error
(
"Nodeboard '%s' on Midplane %s, state went from %d to %d,"
error
(
"Nodeboard '%s' on Midplane %s, state went from %d to %d,"
...
@@ -351,7 +368,8 @@ void event_handler::handleNodeBoardStateChangedRealtimeEvent(
...
@@ -351,7 +368,8 @@ void event_handler::handleNodeBoardStateChangedRealtimeEvent(
info
(
"Nodeboard '%s' on Midplane %s(%s), "
info
(
"Nodeboard '%s' on Midplane %s(%s), "
"has returned to service"
,
"has returned to service"
,
nb_name
,
mp_name
,
ba_mp
->
coord_str
);
nb_name
,
mp_name
,
ba_mp
->
coord_str
);
return
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment