Skip to content

Commit 22fd295

Browse files
committed
Update cfs.c
1 parent ab4c252 commit 22fd295

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

cfs.c

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "distribute.h"
55

6-
#define MIN_ARGS_C 16
7-
#define MIN_ARGS_F 7
6+
#define MIN_ARGS_C 15
7+
#define MIN_ARGS_F 6
88
#define MIN_ARGS 2
99

1010
int main(int argc, char const *argv[])
@@ -17,16 +17,19 @@ int main(int argc, char const *argv[])
1717
else
1818
{
1919
int minPrio, maxPrio;
20-
int avgPL, minPL, maxPL, distPL;
21-
int avgIAT, minIAT, maxIAT, distIAT;
22-
int rqLen;
20+
int avgPL, minPL, maxPL;
21+
char *distPL, *distIAT;
22+
int avgIAT, minIAT, maxIAT;
23+
int rqLen, allp, outmode;
24+
char *outfile = NULL;
25+
char *infile = NULL;
2326

2427
char prog_mode[2];
2528
strcpy(prog_mode, argv[1]);
2629

2730
if ( strcmp(prog_mode, "C") == 0)
2831
{
29-
if ( argc != MIN_ARGS_C )
32+
if ( argc < MIN_ARGS_C )
3033
{
3134
fprintf(stderr, "Argument number is not sufficient");
3235
exit(-1);
@@ -35,19 +38,31 @@ int main(int argc, char const *argv[])
3538
minPrio = atoi(argv[2]); maxPrio = atoi(argv[3]);
3639
distPL = argv[4]; avgPL = atoi(argv[5]); minPL = atoi(argv[6]); maxPL = atoi(argv[7]);
3740
distIAT = argv[8]; avgIAT = atoi(argv[9]); minIAT = atoi(argv[10]); maxIAT = atoi(argv[11]);
38-
rqLen = atoi(argv[12]);
39-
41+
rqLen = atoi(argv[12]); allp = atoi(argv[13]); outmode = atoi(argv[14]);
4042

43+
if ( argc == MIN_ARGS_C + 1 )
44+
{
45+
outfile = argv[15];
46+
}
4147

4248
}
4349
else if ( strcmp(prog_mode, "F") == 0 )
4450
{
45-
if ( argc != MIN_ARGS_F )
51+
if ( argc < MIN_ARGS_F )
4652
{
4753
fprintf(stderr, "Argument number is not sufficient");
4854
exit(-1);
4955
}
50-
// Take command line parameters and params in the file
56+
// Take command line parameters
57+
rqLen = atoi(argv[2]);
58+
allp = atoi(argv[3]);
59+
outmode = atoi(argv[4]);
60+
infile = argv[5];
61+
62+
if ( argc == MIN_ARGS_F + 1 )
63+
{
64+
outfile = argv[6];
65+
}
5166
}
5267

5368
// Continue execution

0 commit comments

Comments
 (0)