diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-10 10:53:21 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-10 10:53:21 +0000 |
commit | 3d56d2b36ab23858e0d6a21271e96ea41538ec2f (patch) | |
tree | dc3240d507fe07736076956cd5133413b772f5c5 /src/transport | |
parent | f7b5b476ba55ee45fefff22777f525cc81b4cae8 (diff) | |
download | gnunet-3d56d2b36ab23858e0d6a21271e96ea41538ec2f.tar.gz gnunet-3d56d2b36ab23858e0d6a21271e96ea41538ec2f.zip |
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/perf_transport_ats.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/transport/perf_transport_ats.c b/src/transport/perf_transport_ats.c index eaec70c7b..680e38f3d 100644 --- a/src/transport/perf_transport_ats.c +++ b/src/transport/perf_transport_ats.c | |||
@@ -50,21 +50,13 @@ static struct GNUNET_TIME_Absolute end; | |||
50 | 50 | ||
51 | void solve_mlp(int presolve) | 51 | void solve_mlp(int presolve) |
52 | { | 52 | { |
53 | int result, solution; | 53 | make |
54 | |||
55 | glp_iocp opt_mlp; | ||
56 | glp_init_iocp(&opt_mlp); | ||
57 | opt_mlp.msg_lev = GLP_MSG_OFF; | ||
58 | opt_mlp.presolve = GLP_OFF; | ||
59 | |||
60 | result = glp_intopt (prob, &opt_mlp); | ||
61 | solution = glp_mip_status (prob); | ||
62 | GNUNET_assert ((solution == 5) && (result==0)); | ||
63 | } | 54 | } |
64 | 55 | ||
65 | void solve_lp(int presolve) | 56 | void solve_lp(int presolve) |
66 | { | 57 | { |
67 | int result, solution; | 58 | int result; |
59 | int solution; | ||
68 | 60 | ||
69 | glp_smcp opt_lp; | 61 | glp_smcp opt_lp; |
70 | glp_init_smcp(&opt_lp); | 62 | glp_init_smcp(&opt_lp); |
@@ -97,7 +89,6 @@ void modify_qm(int start, int length, int values_to_change) | |||
97 | { | 89 | { |
98 | printf("%i = %f \n", ind[c2], val[c2]); | 90 | printf("%i = %f \n", ind[c2], val[c2]); |
99 | } | 91 | } |
100 | |||
101 | c++; | 92 | c++; |
102 | } | 93 | } |
103 | //glp_set_mat_row(prob, start, length, ind, val); | 94 | //glp_set_mat_row(prob, start, length, ind, val); |
@@ -249,14 +240,11 @@ int main (int argc, char *argv[]) | |||
249 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting testcase\n"); | 240 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed, exiting testcase\n"); |
250 | return 0; | 241 | return 0; |
251 | #else | 242 | #else |
252 | #if 0 | 243 | |
253 | #endif | ||
254 | int nullfd = OPEN ("/dev/null", O_RDWR | O_APPEND); | 244 | int nullfd = OPEN ("/dev/null", O_RDWR | O_APPEND); |
255 | if (nullfd < 0) | 245 | if (nullfd < 0) |
256 | return GNUNET_SYSERR; | 246 | return GNUNET_SYSERR; |
257 | /* set stdin/stdout to /dev/null */ | 247 | if (dup2 (nullfd, 1) < 0) |
258 | //stdi | ||
259 | if (/*(dup2 (nullfd, 0) < 0) || */(dup2 (nullfd, 1) < 0)) | ||
260 | { | 248 | { |
261 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup2"); | 249 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup2"); |
262 | (void) CLOSE (nullfd); | 250 | (void) CLOSE (nullfd); |