Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tag 1.1.2

  • Loading branch information...
commit 6ac3aa9440a11b6745bf99739afc82b0937aabb8 2 parents 8eb6c97 + 401ddfa
@morrone morrone authored
View
5 auxdir/x_ac_bluegene.m4
@@ -52,7 +52,10 @@ AC_DEFUN([X_AC_BLUEGENE],
ac_with_readline="no"
AC_ARG_WITH(bg-link, AS_HELP_STRING(--with-bg-link=dynamic|static,set brigdeapi linking type), [bg_link="$withval"])
-
+
+ #remove this later hard code to always do static
+ bg_link=static
+
saved_LDFLAGS="$LDFLAGS"
if test "$bg_link" = "dynamic"; then
LDFLAGS="$saved_LDFLAGS $bg_ldflags_d"
View
3  configure
@@ -23664,6 +23664,9 @@ if test "${with_bg_link+set}" = set; then
bg_link="$withval"
fi;
+ #remove this later hard code to always do static
+ bg_link=static
+
saved_LDFLAGS="$LDFLAGS"
if test "$bg_link" = "dynamic"; then
LDFLAGS="$saved_LDFLAGS $bg_ldflags_d"
View
9 src/slurmd/slurmstepd/mgr.c
@@ -1513,10 +1513,11 @@ _slurmd_job_log_init(slurmd_job_t *job)
log_set_argv0(argv0);
/* Connect slurmd stderr to job's stderr */
- if ((!job->spawn_task) &&
- (dup2(job->task[0]->stderr_fd, STDERR_FILENO) < 0)) {
- error("job_log_init: dup2(stderr): %m");
- return;
+ if ((!job->spawn_task) && (job->task != NULL)) {
+ if (dup2(job->task[0]->stderr_fd, STDERR_FILENO) < 0) {
+ error("job_log_init: dup2(stderr): %m");
+ return;
+ }
}
}
View
11 src/slurmd/slurmstepd/slurmstepd_job.c
@@ -434,13 +434,18 @@ _job_init_task_info(slurmd_job_t *job, uint32_t *gtid,
char *ifname, char *ofname, char *efname)
{
int i;
- int n = job->ntasks;
char *in, *out, *err;
+ if (job->ntasks == 0) {
+ error("User requested launch of zero tasks!");
+ job->task = NULL;
+ return;
+ }
+
job->task = (slurmd_task_info_t **)
- xmalloc(n * sizeof(slurmd_task_info_t *));
+ xmalloc(job->ntasks * sizeof(slurmd_task_info_t *));
- for (i = 0; i < n; i++){
+ for (i = 0; i < job->ntasks; i++){
in = _expand_stdio_filename(ifname, gtid[i], job);
out = _expand_stdio_filename(ofname, gtid[i], job);
err = _expand_stdio_filename(efname, gtid[i], job);
Please sign in to comment.
Something went wrong with that request. Please try again.