jobs.c
author viric@llimona
Tue, 27 Mar 2007 23:29:56 +0200
changeset 58 3c492266923e
parent 55 678ca291d545
child 63 47be318f4cbc
permissions -rw-r--r--
Preparing v0.2.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
49
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     1
/*
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     2
    Task Spooler - a task queue system for the unix user
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     3
    Copyright (C) 2007  LluĂ­s Batlle i Rossell
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     4
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     5
    Please find the license in the provided COPYING file.
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 44
diff changeset
     6
*/
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
     7
#include <stdlib.h>
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
     8
#include <unistd.h>
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
     9
#include <stdio.h>
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    10
#include <assert.h>
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
    11
#include <string.h>
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    12
#include "msg.h"
32
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
    13
#include "main.h"
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    14
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
    15
static enum
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
    16
{
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
    17
    FREE, /* No task is running */
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
    18
    WAITING /* A task is running, and the server is waiting */
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
    19
} state = FREE;
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
    20
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    21
struct Job
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    22
{
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    23
    struct Job *next;
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    24
    int jobid;
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
    25
    char *command;
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    26
    enum Jobstate state;
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
    27
    int errorlevel;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    28
    char *output_filename;
27
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
    29
    int store_output;
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 32
diff changeset
    30
    int pid;
55
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 54
diff changeset
    31
    int should_keep_finished;
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    32
};
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    33
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    34
struct Notify
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    35
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    36
    int socket;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    37
    int jobid;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    38
    struct Notify *next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    39
};
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    40
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    41
/* Globals */
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    42
static struct Job *firstjob = 0;
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
    43
static struct Job *first_finished_job = 0;
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
    44
static int jobids = 0;
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
    45
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    46
static struct Notify *first_notify = 0;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
    47
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    48
static void send_list_line(int s, const char * str)
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    49
{
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    50
    struct msg m;
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    51
21
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    52
    /* Message */
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    53
    m.type = LIST_LINE;
21
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    54
    m.u.line_size = strlen(str) + 1;
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    55
21
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    56
    send_msg(s, &m);
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    57
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    58
    /* Send the line */
a797f96a022f Lines for list doesn't have limit.
viric@llimona
parents: 20
diff changeset
    59
    send_bytes(s, str, m.u.line_size);
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    60
}
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
    61
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    62
static void send_urgent_ok(int s)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    63
{
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    64
    struct msg m;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    65
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    66
    /* Message */
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    67
    m.type = URGENT_OK;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    68
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    69
    send_msg(s, &m);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    70
}
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    71
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    72
static struct Job * find_previous_job(struct Job *final)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    73
{
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    74
    struct Job *p;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    75
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    76
    /* Show Queued or Running jobs */
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    77
    p = firstjob;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    78
    while(p != 0)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    79
    {
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    80
        if (p->next == final)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    81
            return p;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    82
        p = p->next;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    83
    }
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    84
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    85
    return 0;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    86
}
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
    87
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    88
static struct Job * findjob(int jobid)
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    89
{
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    90
    struct Job *p;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    91
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    92
    /* Show Queued or Running jobs */
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    93
    p = firstjob;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    94
    while(p != 0)
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    95
    {
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    96
        if (p->jobid == jobid)
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    97
            return p;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    98
        p = p->next;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
    99
    }
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   100
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   101
    return 0;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   102
}
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   103
32
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   104
static struct Job * find_finished_job(int jobid)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   105
{
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   106
    struct Job *p;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   107
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   108
    /* Show Queued or Running jobs */
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   109
    p = first_finished_job;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   110
    while(p != 0)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   111
    {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   112
        if (p->jobid == jobid)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   113
            return p;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   114
        p = p->next;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   115
    }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   116
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   117
    return 0;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   118
}
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   119
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   120
void s_mark_job_running()
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   121
{
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   122
    firstjob->state = RUNNING;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   123
}
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   124
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   125
static const char * jstate2string(enum Jobstate s)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   126
{
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   127
    char * jobstate;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   128
    switch(s)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   129
    {
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   130
        case QUEUED:
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   131
            jobstate = "queued";
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   132
            break;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   133
        case RUNNING:
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   134
            jobstate = "running";
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   135
            break;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   136
        case FINISHED:
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   137
            jobstate = "finished";
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   138
            break;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   139
    }
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   140
    return jobstate;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   141
}
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   142
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   143
void s_list(int s)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   144
{
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   145
    struct Job *p;
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   146
    char buffer[LINE_LEN];
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   147
39
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   148
    sprintf(buffer, "%-4s%-10s%-20s%-8s%-37s\n",
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   149
            "ID",
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   150
            "State",
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   151
            "Output",
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   152
            "E-Level",
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   153
            "Command");
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   154
    send_list_line(s,buffer);
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   155
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   156
    /* Show Queued or Running jobs */
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   157
    p = firstjob;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   158
    while(p != 0)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   159
    {
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   160
        const char * jobstate;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   161
        const char * output_filename;
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   162
        jobstate = jstate2string(p->state);
27
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   163
        if (p->store_output)
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   164
        {
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   165
            if (p->state == RUNNING)
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   166
            {
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   167
                if (p->output_filename == 0)
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   168
                    /* This may happen due to concurrency
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   169
                     * problems */
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   170
                    output_filename = "(...)";
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   171
                else
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   172
                    output_filename = p->output_filename;
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   173
            } else
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   174
                output_filename = "(file)";
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   175
        } else
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   176
            output_filename = "stdout";
27
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   177
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   178
           
39
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   179
        sprintf(buffer, "%-4i%-10s%-20s%-8s%-37s\n",
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   180
                p->jobid,
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   181
                jobstate,
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   182
                output_filename,
39
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   183
                "",
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   184
                p->command);
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   185
        send_list_line(s,buffer);
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   186
        p = p->next;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   187
    }
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   188
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   189
    p = first_finished_job;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   190
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   191
    if (p != 0)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   192
    {
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   193
        /* Show Finished jobs */
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   194
        while(p != 0)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   195
        {
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   196
            const char * jobstate;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   197
            const char * output_filename;
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   198
            jobstate = jstate2string(p->state);
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   199
            if (p->output_filename == 0)
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   200
                output_filename = "stdout";
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   201
            else
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   202
                output_filename = p->output_filename;
39
849ec300325c Better list output.
viric@llimona
parents: 35
diff changeset
   203
            sprintf(buffer, "%-4i%-10s%-20s%-8i%-37s\n",
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   204
                    p->jobid,
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   205
                    jobstate,
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   206
                    output_filename,
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   207
                    p->errorlevel,
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   208
                    p->command);
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   209
            send_list_line(s,buffer);
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   210
            p = p->next;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   211
        }
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   212
    }
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   213
}
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   214
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   215
static struct Job * newjobptr()
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   216
{
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   217
    struct Job *p;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   218
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   219
    if (firstjob == 0)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   220
    {
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   221
        firstjob = (struct Job *) malloc(sizeof(*firstjob));
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   222
        firstjob->next = 0;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   223
        return firstjob;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   224
    }
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   225
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   226
    p = firstjob;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   227
    while(p->next != 0)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   228
        p = p->next;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   229
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   230
    p->next = (struct Job *) malloc(sizeof(*p));
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   231
    p->next->next = 0;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   232
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   233
    return p->next;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   234
}
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   235
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   236
/* Returns job id */
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   237
int s_newjob(int s, struct msg *m)
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   238
{
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   239
    struct Job *p;
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   240
    int res;
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   241
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   242
    p = newjobptr();
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   243
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   244
    p->jobid = jobids++;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   245
    p->state = QUEUED;
27
886bdb2f4632 Fixed the Output File information in the list.
viric@llimona
parents: 26
diff changeset
   246
    p->store_output = m->u.newjob.store_output;
55
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 54
diff changeset
   247
    p->should_keep_finished = m->u.newjob.should_keep_finished;
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   248
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   249
    /* load the command */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   250
    p->command = malloc(m->u.newjob.command_size);
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   251
    /* !!! Check retval */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   252
    res = recv_bytes(s, p->command, m->u.newjob.command_size);
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   253
    assert(res != -1);
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   254
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   255
    return p->jobid;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   256
}
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   257
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   258
void s_removejob(int jobid)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   259
{
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   260
    struct Job *p;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   261
    struct Job *newnext;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   262
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   263
    if (firstjob->jobid == jobid)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   264
    {
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   265
        struct Job *newfirst;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   266
        /* First job is to be removed */
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   267
        newfirst = firstjob->next;
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   268
        free(firstjob->command);
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   269
        free(firstjob);
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   270
        firstjob = newfirst;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   271
        return;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   272
    }
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   273
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   274
    p = firstjob;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   275
    /* Not first job */
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   276
    while (p->next != 0)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   277
    {
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   278
        if (p->next->jobid == jobid)
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   279
            break;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   280
        p = p->next;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   281
    }
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   282
    assert(p->next != 0);
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   283
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   284
    newnext = p->next->next;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   285
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 9
diff changeset
   286
    free(p->next->command);
3
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   287
    free(p->next);
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   288
    p->next = newnext;
2fb8a6bdd024 More code.
viric@llimona
parents:
diff changeset
   289
}
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   290
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   291
/* -1 if no one should be run. */
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   292
int next_run_job()
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   293
{
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   294
    if (state == WAITING)
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   295
        return -1;
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   296
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   297
    if (firstjob != 0)
9
9acd8ae3190c First usable version!
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   298
    {
9acd8ae3190c First usable version!
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   299
        state = WAITING;
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   300
        return firstjob->jobid;
9
9acd8ae3190c First usable version!
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   301
    }
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   302
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   303
    return -1;
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   304
}
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   305
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   306
/* Add the job to the finished queue. */
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   307
static void new_finished_job(struct Job *j)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   308
{
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   309
    struct Job *p;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   310
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   311
    if (first_finished_job == 0)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   312
    {
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   313
        first_finished_job = j;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   314
        first_finished_job->next = 0;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   315
        return;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   316
    }
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   317
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   318
    p = first_finished_job;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   319
    while(p->next != 0)
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   320
        p = p->next;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   321
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   322
    p->next = j;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   323
    p->next->next = 0;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   324
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   325
    return;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   326
}
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   327
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   328
void job_finished(int errorlevel)
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   329
{
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   330
    struct Job *newfirst;
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   331
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   332
    assert(state == WAITING);
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   333
    assert(firstjob != 0);
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   334
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   335
    assert(firstjob->state == RUNNING);
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   336
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   337
    /* Mark state */
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   338
    firstjob->state = FINISHED;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   339
    firstjob->errorlevel = errorlevel;
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   340
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   341
    /* Add it to the finished queue */
26
19d1bfdaa885 Fixed a bug with the job list.
viric@llimona
parents: 22
diff changeset
   342
    newfirst = firstjob->next;
55
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 54
diff changeset
   343
    if (firstjob->should_keep_finished)
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 54
diff changeset
   344
        new_finished_job(firstjob);
19
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   345
5efc347cca8d The finished jobs store the errorlevel, and can be listed.
viric@llimona
parents: 18
diff changeset
   346
    /* Remove it from the run queue */
26
19d1bfdaa885 Fixed a bug with the job list.
viric@llimona
parents: 22
diff changeset
   347
    firstjob = newfirst;
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   348
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   349
    state = FREE;
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   350
}
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   351
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   352
void s_clear_finished()
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   353
{
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   354
    struct Job *p;
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   355
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   356
    if (first_finished_job == 0)
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   357
        return;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   358
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   359
    p = first_finished_job;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   360
    first_finished_job = 0;
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   361
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   362
    while (p->next != 0)
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   363
    {
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   364
        struct Job *tmp;
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   365
        tmp = p->next;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   366
        free(p->command);
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   367
        free(p->output_filename);
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   368
        free(p);
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   369
        p = tmp;
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   370
    }
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   371
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   372
    free(p->next);
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 19
diff changeset
   373
}
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   374
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 32
diff changeset
   375
void s_process_runjob_ok(int jobid, char *oname, int pid)
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   376
{
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   377
    struct Job *p;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   378
    p = findjob(jobid);
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   379
    assert(p != 0);
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   380
    assert(p->state == RUNNING);
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   381
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 32
diff changeset
   382
    p->pid = pid;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   383
    p->output_filename = oname;
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 21
diff changeset
   384
}
32
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   385
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   386
void s_send_output(int s, int jobid)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   387
{
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   388
    struct Job *p = 0;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   389
    struct msg m;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   390
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   391
    if (jobid == -1)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   392
    {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   393
        /* This means that we want the tail of the running task, or that
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   394
         * of the last job run */
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   395
        if (state == WAITING)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   396
        {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   397
            p = firstjob;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   398
            assert(p != 0);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   399
        }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   400
        else
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   401
        {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   402
            p = first_finished_job;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   403
            if (p == 0)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   404
            {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   405
                send_list_line(s, "No jobs.\n");
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   406
                return;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   407
            }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   408
            while(p->next != 0)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   409
                p = p->next;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   410
        }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   411
    } else
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   412
    {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   413
        if (state == WAITING && firstjob->jobid == jobid)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   414
            p = firstjob;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   415
        else
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   416
            p = find_finished_job(jobid);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   417
    }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   418
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   419
    if (p == 0)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   420
    {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   421
        char tmp[50];
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   422
        sprintf(tmp, "Job %i not finished or not running.\n", jobid);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   423
        send_list_line(s, tmp);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   424
        return;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   425
    }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   426
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   427
    m.type = ANSWER_OUTPUT;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   428
    if (!p->store_output)
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   429
    {
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   430
        send_list_line(s, "The job hasn't output stored.\n");
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   431
        return;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   432
    }
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   433
    m.u.output.store_output = p->store_output;
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 32
diff changeset
   434
    m.u.output.pid = p->pid;
32
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   435
    m.u.output.ofilename_size = strlen(p->output_filename) + 1;
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   436
    send_msg(s, &m);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   437
    send_bytes(s, p->output_filename, m.u.output.ofilename_size);
3531439f2770 Tail works.
viric@llimona
parents: 27
diff changeset
   438
}
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   439
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   440
void s_remove_job(int s, int jobid)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   441
{
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   442
    struct Job *p = 0;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   443
    struct msg m;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   444
    struct Job *before_p = 0;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   445
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   446
    if (jobid == -1)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   447
    {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   448
        /* Find the last job added */
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   449
        p = firstjob;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   450
        if (p != 0)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   451
        {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   452
            while (p->next != 0)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   453
            {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   454
                before_p = p;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   455
                p = p->next;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   456
            }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   457
        }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   458
    }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   459
    else
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   460
    {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   461
        p = firstjob;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   462
        if (p != 0)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   463
        {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   464
            while (p->next != 0 && p->jobid != jobid)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   465
            {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   466
                before_p = p;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   467
                p = p->next;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   468
            }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   469
        }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   470
    }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   471
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   472
    if (p == 0 || p->state != QUEUED || before_p == 0)
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   473
    {
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   474
        char tmp[50];
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   475
        if (jobid == -1)
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
   476
            sprintf(tmp, "The last job cannot be removed.\n");
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   477
        else
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   478
            sprintf(tmp, "The job %i cannot be removed.\n", jobid);
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   479
        send_list_line(s, tmp);
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   480
        return;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   481
    }
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   482
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   483
    before_p->next = p->next;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   484
    free(p);
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   485
    m.type = REMOVEJOB_OK;
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   486
    send_msg(s, &m);
cad41574feda Added 'remove job'.
viric@llimona
parents: 39
diff changeset
   487
}
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   488
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   489
static void add_to_notify_list(int s, int jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   490
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   491
    struct Notify *n;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   492
    struct Notify *new;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   493
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   494
    new = (struct Notify *) malloc(sizeof(*n));
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   495
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   496
    new->socket = s;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   497
    new->jobid = jobid;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   498
    new->next = 0;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   499
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   500
    n = first_notify;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   501
    if (n == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   502
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   503
        first_notify = new;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   504
        return;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   505
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   506
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   507
    while(n->next != 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   508
        n = n->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   509
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   510
    n->next = new;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   511
}
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   512
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   513
static void send_waitjob_ok(int s, int errorlevel)
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   514
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   515
    struct msg m;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   516
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   517
    m.type = WAITJOB_OK;
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   518
    m.u.errorlevel = errorlevel;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   519
    send_msg(s, &m);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   520
}
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   521
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   522
static struct Job *
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   523
get_job(int jobid)
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   524
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   525
    struct Job *j;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   526
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   527
    j = findjob(jobid);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   528
    if (j != NULL)
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   529
        return j;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   530
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   531
    j = find_finished_job(jobid);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   532
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   533
    if (j != NULL)
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   534
        return j;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   535
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   536
    return 0;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   537
}
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   538
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   539
/* Don't complain, if the socket doesn't exist */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   540
void s_remove_notification(int s)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   541
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   542
    struct Notify *n;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   543
    struct Notify *previous;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   544
    n = first_notify;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   545
    while (n != 0 && n->socket != s)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   546
        n = n->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   547
    if (n == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   548
        return;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   549
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   550
    /* Remove the notification */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   551
    previous = first_notify;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   552
    if (n == previous)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   553
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   554
        free(first_notify);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   555
        first_notify = 0;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   556
        return;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   557
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   558
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   559
    /* if not the first... */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   560
    while(previous->next != n)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   561
        previous = previous->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   562
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   563
    previous->next = n->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   564
    free(n);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   565
}
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   566
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   567
/* This is called when a job finishes */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   568
void check_notify_list(int jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   569
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   570
    struct Notify *n;
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   571
    struct Job *j;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   572
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   573
    n = first_notify;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   574
    while (n != 0 && n->jobid != jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   575
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   576
        n = n->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   577
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   578
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   579
    if (n == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   580
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   581
        return;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   582
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   583
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   584
    j = get_job(jobid);
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   585
    /* If the job finishes, notify the waiter */
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   586
    if (j->state == FINISHED)
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   587
    {
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   588
        send_waitjob_ok(n->socket, j->errorlevel);
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   589
        s_remove_notification(n->socket);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   590
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   591
}
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   592
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   593
void s_wait_job(int s, int jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   594
{
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   595
    struct Job *p = 0;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   596
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   597
    if (jobid == -1)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   598
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   599
        /* Find the last job added */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   600
        p = firstjob;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   601
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   602
        if (p != 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   603
            while (p->next != 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   604
                p = p->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   605
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   606
        /* Look in finished jobs if needed */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   607
        if (p == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   608
        {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   609
            p = first_finished_job;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   610
            if (p != 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   611
                while (p->next != 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   612
                    p = p->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   613
        }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   614
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   615
    else
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   616
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   617
        p = firstjob;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   618
        while (p != 0 && p->jobid != jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   619
            p = p->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   620
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   621
        /* Look in finished jobs if needed */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   622
        if (p == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   623
        {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   624
            p = first_finished_job;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   625
            while (p != 0 && p->jobid != jobid)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   626
                p = p->next;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   627
        }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   628
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   629
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   630
    if (p == 0)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   631
    {
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   632
        char tmp[50];
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   633
        if (jobid == -1)
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
   634
            sprintf(tmp, "The last job cannot be waited.\n");
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   635
        else
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   636
            sprintf(tmp, "The job %i cannot be waited.\n", jobid);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   637
        send_list_line(s, tmp);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   638
        return;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   639
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   640
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   641
    if (p->state == FINISHED)
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   642
    {
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   643
        send_waitjob_ok(s, p->errorlevel);
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   644
    }
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   645
    else
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   646
        add_to_notify_list(s, p->jobid);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   647
}
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   648
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   649
void s_move_urgent(int s, int jobid)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   650
{
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   651
    struct Job *p = 0;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   652
    struct Job *tmp1;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   653
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   654
    if (jobid == -1)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   655
    {
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   656
        /* Find the last job added */
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   657
        p = firstjob;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   658
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   659
        if (p != 0)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   660
            while (p->next != 0)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   661
                p = p->next;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   662
    }
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   663
    else
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   664
    {
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   665
        p = firstjob;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   666
        while (p != 0 && p->jobid != jobid)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   667
            p = p->next;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   668
    }
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   669
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   670
    if (p == 0 || firstjob->next == 0)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   671
    {
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   672
        char tmp[50];
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   673
        if (jobid == -1)
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   674
            sprintf(tmp, "The last job cannot be urged.\n");
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   675
        else
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   676
            sprintf(tmp, "The job %i cannot be urged.\n", jobid);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   677
        send_list_line(s, tmp);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   678
        return;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   679
    }
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   680
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   681
    /* Interchange the pointers */
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   682
    tmp1 = find_previous_job(p);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   683
    tmp1->next = p->next;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   684
    p->next = firstjob->next;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   685
    firstjob->next = p;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   686
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   687
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   688
    send_urgent_ok(s);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 51
diff changeset
   689
}