14
14
#define MIN_ARGS_C 15
15
15
#define MIN_ARGS_F 6
16
16
#define MIN_ARGS 2
17
+ #define STR_SIZE 20
17
18
18
19
// Global (Shared) Data
19
20
@@ -42,14 +43,14 @@ void *process(void *args);
42
43
43
44
struct generator_params
44
45
{
45
- char * distPL , * distIAT ;
46
+ char distPL [ STR_SIZE ], distIAT [ STR_SIZE ] ;
46
47
int avgPL , avgIAT ;
47
48
int minPL , minIAT ;
48
49
int maxPL , maxIAT ;
49
50
int minPrio , maxPrio ;
50
51
int allp ;
51
52
int mode ;
52
- char * infile ;
53
+ char infile [ STR_SIZE ] ;
53
54
};
54
55
55
56
struct process_params
@@ -72,11 +73,11 @@ int main(int argc, char const *argv[])
72
73
{
73
74
int minPrio , maxPrio ;
74
75
int avgPL , minPL , maxPL ;
75
- char * distPL , * distIAT ;
76
+ char distPL [ STR_SIZE ], distIAT [ STR_SIZE ] ;
76
77
int avgIAT , minIAT , maxIAT ;
77
78
int rqLen , allp , outmode ;
78
- char * outfile = NULL ;
79
- char * infile = NULL ;
79
+ char outfile [ STR_SIZE ] ;
80
+ char infile [ STR_SIZE ] ;
80
81
81
82
char prog_mode [2 ];
82
83
strcpy (prog_mode , argv [1 ]);
@@ -90,13 +91,14 @@ int main(int argc, char const *argv[])
90
91
}
91
92
// Take command line parameters
92
93
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 ]);
95
97
rqLen = atoi (argv [12 ]); allp = atoi (argv [13 ]); outmode = atoi (argv [14 ]);
96
98
97
99
if ( argc == MIN_ARGS_C + 1 )
98
100
{
99
- outfile = argv [15 ];
101
+ strcpy ( outfile , argv [15 ]) ;
100
102
}
101
103
102
104
}
@@ -111,11 +113,11 @@ int main(int argc, char const *argv[])
111
113
rqLen = atoi (argv [2 ]);
112
114
allp = atoi (argv [3 ]);
113
115
outmode = atoi (argv [4 ]);
114
- infile = argv [5 ];
116
+ strcpy ( infile , argv [5 ]) ;
115
117
116
118
if ( argc == MIN_ARGS_F + 1 )
117
119
{
118
- outfile = argv [6 ];
120
+ strcpy ( outfile , argv [6 ]) ;
119
121
}
120
122
}
121
123
@@ -145,7 +147,7 @@ int main(int argc, char const *argv[])
145
147
pthread_t generator_tid , scheduler_tid ;
146
148
147
149
struct generator_params params ;
148
- params .distPL = distPL ; params .distIAT = distIAT ;
150
+ strcpy ( params .distPL , distPL ); strcpy ( params .distIAT , distIAT ) ;
149
151
params .avgPL = avgPL ; params .avgIAT = avgIAT ;
150
152
params .minPL = minPL ; params .minIAT = minIAT ;
151
153
params .maxPL = maxPL ; params .maxIAT = maxIAT ;
@@ -157,7 +159,7 @@ int main(int argc, char const *argv[])
157
159
else
158
160
{
159
161
params .mode = 1 ;
160
- params .infile = infile ;
162
+ strcpy ( params .infile , infile ) ;
161
163
}
162
164
163
165
0 commit comments