Skip to content

Commit e7462b2

Browse files
committed
Update cfs.c
1 parent b2cf871 commit e7462b2

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

cfs.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#define MIN_ARGS_C 15
1515
#define MIN_ARGS_F 6
1616
#define MIN_ARGS 2
17+
#define STR_SIZE 20
1718

1819
// Global (Shared) Data
1920

@@ -42,14 +43,14 @@ void *process(void *args);
4243

4344
struct generator_params
4445
{
45-
char *distPL, *distIAT;
46+
char distPL[STR_SIZE], distIAT[STR_SIZE];
4647
int avgPL, avgIAT;
4748
int minPL, minIAT;
4849
int maxPL, maxIAT;
4950
int minPrio, maxPrio;
5051
int allp;
5152
int mode;
52-
char *infile;
53+
char infile[STR_SIZE];
5354
};
5455

5556
struct process_params
@@ -72,11 +73,11 @@ int main(int argc, char const *argv[])
7273
{
7374
int minPrio, maxPrio;
7475
int avgPL, minPL, maxPL;
75-
char *distPL, *distIAT;
76+
char distPL[STR_SIZE], distIAT[STR_SIZE];
7677
int avgIAT, minIAT, maxIAT;
7778
int rqLen, allp, outmode;
78-
char *outfile = NULL;
79-
char *infile = NULL;
79+
char outfile[STR_SIZE];
80+
char infile[STR_SIZE];
8081

8182
char prog_mode[2];
8283
strcpy(prog_mode, argv[1]);
@@ -90,13 +91,14 @@ int main(int argc, char const *argv[])
9091
}
9192
// Take command line parameters
9293
minPrio = atoi(argv[2]); maxPrio = atoi(argv[3]);
93-
distPL = argv[4]; avgPL = atoi(argv[5]); minPL = atoi(argv[6]); maxPL = atoi(argv[7]);
94-
distIAT = argv[8]; avgIAT = atoi(argv[9]); minIAT = atoi(argv[10]); maxIAT = atoi(argv[11]);
94+
//distPL = argv[4];
95+
strcpy(distPL, argv[4]); avgPL = atoi(argv[5]); minPL = atoi(argv[6]); maxPL = atoi(argv[7]);
96+
strcpy(distIAT, argv[8]); avgIAT = atoi(argv[9]); minIAT = atoi(argv[10]); maxIAT = atoi(argv[11]);
9597
rqLen = atoi(argv[12]); allp = atoi(argv[13]); outmode = atoi(argv[14]);
9698

9799
if ( argc == MIN_ARGS_C + 1 )
98100
{
99-
outfile = argv[15];
101+
strcpy(outfile,argv[15]);
100102
}
101103

102104
}
@@ -111,11 +113,11 @@ int main(int argc, char const *argv[])
111113
rqLen = atoi(argv[2]);
112114
allp = atoi(argv[3]);
113115
outmode = atoi(argv[4]);
114-
infile = argv[5];
116+
strcpy(infile, argv[5]);
115117

116118
if ( argc == MIN_ARGS_F + 1 )
117119
{
118-
outfile = argv[6];
120+
strcpy(outfile, argv[6]);
119121
}
120122
}
121123

@@ -145,7 +147,7 @@ int main(int argc, char const *argv[])
145147
pthread_t generator_tid, scheduler_tid;
146148

147149
struct generator_params params;
148-
params.distPL = distPL; params.distIAT = distIAT;
150+
strcpy(params.distPL, distPL); strcpy(params.distIAT, distIAT);
149151
params.avgPL = avgPL; params.avgIAT = avgIAT;
150152
params.minPL = minPL; params.minIAT = minIAT;
151153
params.maxPL = maxPL; params.maxIAT = maxIAT;
@@ -157,7 +159,7 @@ int main(int argc, char const *argv[])
157159
else
158160
{
159161
params.mode = 1;
160-
params.infile = infile;
162+
strcpy(params.infile, infile);
161163
}
162164

163165

0 commit comments

Comments
 (0)