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
f7d8dc44
Commit
f7d8dc44
authored
18 years ago
by
Moe Jette
Browse files
Options
Downloads
Patches
Plain Diff
Make slurmd/slurmstepd conf variable an extern to build cons_res plugin
on osx.
parent
4b56a590
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/slurmd/slurmd/slurmd.c
+2
-1
2 additions, 1 deletion
src/slurmd/slurmd/slurmd.c
src/slurmd/slurmd/slurmd.h
+2
-2
2 additions, 2 deletions
src/slurmd/slurmd/slurmd.h
src/slurmd/slurmstepd/slurmstepd.c
+4
-1
4 additions, 1 deletion
src/slurmd/slurmstepd/slurmstepd.c
with
8 additions
and
4 deletions
src/slurmd/slurmd/slurmd.c
+
2
−
1
View file @
f7d8dc44
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* src/slurmd/slurmd/slurmd.c - main slurm node server daemon
* src/slurmd/slurmd/slurmd.c - main slurm node server daemon
* $Id$
* $Id$
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Copyright (C) 2002
-2006
The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* Written by Mark Grondona <mgrondona@llnl.gov>.
* UCRL-CODE-217948.
* UCRL-CODE-217948.
...
@@ -90,6 +90,7 @@
...
@@ -90,6 +90,7 @@
/* global, copied to STDERR_FILENO in tasks before the exec */
/* global, copied to STDERR_FILENO in tasks before the exec */
int
devnull
=
-
1
;
int
devnull
=
-
1
;
slurmd_conf_t
*
conf
;
/*
/*
* count of active threads
* count of active threads
...
...
This diff is collapsed.
Click to expand it.
src/slurmd/slurmd/slurmd.h
+
2
−
2
View file @
f7d8dc44
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* src/slurmd/slurmd/slurmd.h - header for slurmd
* src/slurmd/slurmd/slurmd.h - header for slurmd
* $Id$
* $Id$
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Copyright (C) 2002
-2006
The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Mark Grondona <mgrondona@llnl.gov>.
* Written by Mark Grondona <mgrondona@llnl.gov>.
* UCRL-CODE-217948.
* UCRL-CODE-217948.
...
@@ -126,7 +126,7 @@ typedef struct slurmd_config {
...
@@ -126,7 +126,7 @@ typedef struct slurmd_config {
uint16_t
fast_schedule
;
/* use config from file/slurmctld */
uint16_t
fast_schedule
;
/* use config from file/slurmctld */
}
slurmd_conf_t
;
}
slurmd_conf_t
;
slurmd_conf_t
*
conf
;
extern
slurmd_conf_t
*
conf
;
/* Send node registration message with status to controller
/* Send node registration message with status to controller
* IN status - same values slurm error codes (for node shutdown)
* IN status - same values slurm error codes (for node shutdown)
...
...
This diff is collapsed.
Click to expand it.
src/slurmd/slurmstepd/slurmstepd.c
+
4
−
1
View file @
f7d8dc44
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* src/slurmd/slurmstepd/slurmstepd.c - SLURM job-step manager.
* src/slurmd/slurmstepd/slurmstepd.c - SLURM job-step manager.
* $Id$
* $Id$
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Copyright (C) 2002
-2006
The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
* Written by Danny Auble <da@llnl.gov>
* Written by Danny Auble <da@llnl.gov>
* and Christopher Morrone <morrone2@llnl.gov>.
* and Christopher Morrone <morrone2@llnl.gov>.
...
@@ -74,6 +74,9 @@ int slurmstepd_blocked_signals[] = {
...
@@ -74,6 +74,9 @@ int slurmstepd_blocked_signals[] = {
SIGPIPE
,
0
SIGPIPE
,
0
};
};
/* global variable */
slurmd_conf_t
*
conf
;
int
int
main
(
int
argc
,
char
*
argv
[])
main
(
int
argc
,
char
*
argv
[])
{
{
...
...
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