git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Re-fix a race.
[sliver-openvswitch.git]
/
tests
/
test-multipath.c
diff --git
a/tests/test-multipath.c
b/tests/test-multipath.c
index
8a35567
..
7a89779
100644
(file)
--- a/
tests/test-multipath.c
+++ b/
tests/test-multipath.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2012 Nicira, Inc.
+ * Copyright (c) 2010, 2012
, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,7
+26,6
@@
#include "flow.h"
#include "ofp-actions.h"
#include "flow.h"
#include "ofp-actions.h"
-#include "random.h"
#include "util.h"
int
#include "util.h"
int
@@
-35,16
+34,20
@@
main(int argc, char *argv[])
enum { MP_MAX_LINKS = 63 };
struct ofpact_multipath mp;
bool ok = true;
enum { MP_MAX_LINKS = 63 };
struct ofpact_multipath mp;
bool ok = true;
+ char *error;
int n;
set_program_name(argv[0]);
int n;
set_program_name(argv[0]);
- random_init();
if (argc != 2) {
ovs_fatal(0, "usage: %s multipath_action", program_name);
}
if (argc != 2) {
ovs_fatal(0, "usage: %s multipath_action", program_name);
}
- multipath_parse(&mp, argv[1]);
+ error = multipath_parse(&mp, argv[1]);
+ if (error) {
+ ovs_fatal(0, "%s", error);
+ }
+
for (n = 1; n <= MP_MAX_LINKS; n++) {
enum { N_FLOWS = 65536 };
double disruption, perfect, distribution;
for (n = 1; n <= MP_MAX_LINKS; n++) {
enum { N_FLOWS = 65536 };
double disruption, perfect, distribution;
@@
-57,16
+60,17
@@
main(int argc, char *argv[])
memset(histogram, 0, sizeof histogram);
for (i = 0; i < N_FLOWS; i++) {
int old_link, new_link;
memset(histogram, 0, sizeof histogram);
for (i = 0; i < N_FLOWS; i++) {
int old_link, new_link;
+ struct flow_wildcards wc;
struct flow flow;
struct flow flow;
-
random_bytes(&flow, sizeof
flow);
+
flow_random_hash_fields(&
flow);
mp.max_link = n - 1;
mp.max_link = n - 1;
- multipath_execute(&mp, &flow);
+ multipath_execute(&mp, &flow
, &wc
);
old_link = flow.regs[0];
mp.max_link = n;
old_link = flow.regs[0];
mp.max_link = n;
- multipath_execute(&mp, &flow);
+ multipath_execute(&mp, &flow
, &wc
);
new_link = flow.regs[0];
assert(old_link >= 0 && old_link < n);
new_link = flow.regs[0];
assert(old_link >= 0 && old_link < n);
@@
-124,7
+128,7
@@
main(int argc, char *argv[])
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}