lib: Move token-bucket.h to <openvswitch/token-bucket.h>

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
index d9f551d..7e225bb 100644 (file)
--- a/include/openvswitch/automake.mk
+++ b/include/openvswitch/automake.mk
@@ -2,6 +2,7 @@ openvswitchincludedir = $(includedir)/openvswitch
 openvswitchinclude_HEADERS = \
        include/openvswitch/compiler.h \
        include/openvswitch/thread.h \
+       include/openvswitch/token-bucket.h \
        include/openvswitch/types.h \
        include/openvswitch/util.h \
        include/openvswitch/version.h

diff --git a/include/openvswitch/token-bucket.h b/include/openvswitch/token-bucket.h
new file mode 100644 (file)
index 0000000..bbcde84
--- /dev/null
+++ b/include/openvswitch/token-bucket.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_TOKEN_BUCKET_H
+#define OPENVSWITCH_TOKEN_BUCKET_H 1
+
+#include <limits.h>
+#include <stdbool.h>
+
+struct token_bucket {
+    /* Configuration settings. */
+    unsigned int rate;          /* Tokens added per millisecond. */
+    unsigned int burst;         /* Max cumulative tokens credit. */
+
+    /* Current status. */
+    unsigned int tokens;        /* Current number of tokens. */
+    long long int last_fill;    /* Last time tokens added. */
+};
+
+#define TOKEN_BUCKET_INIT(RATE, BURST) { RATE, BURST, 0, LLONG_MIN }
+
+void token_bucket_init(struct token_bucket *,
+                       unsigned int rate, unsigned int burst);
+void token_bucket_set(struct token_bucket *,
+                       unsigned int rate, unsigned int burst);
+bool token_bucket_withdraw(struct token_bucket *, unsigned int n);
+void token_bucket_wait(struct token_bucket *, unsigned int n);
+
+#endif /* token-bucket.h */

diff --git a/lib/automake.mk b/lib/automake.mk
index a98f7cc..ba5f80a 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -245,7 +245,6 @@ lib_libopenvswitch_la_SOURCES = \
        lib/tnl-ports.c \
        lib/tnl-ports.h \
        lib/token-bucket.c \
-       lib/token-bucket.h \
        lib/type-props.h \
        lib/unaligned.h \
        lib/unicode.c \

diff --git a/lib/token-bucket.c b/lib/token-bucket.c
index 73f11a8..23bc6ed 100644 (file)
--- a/lib/token-bucket.c
+++ b/lib/token-bucket.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "token-bucket.h"
+#include "openvswitch/token-bucket.h"
 
 #include "poll-loop.h"
 #include "sat-math.h"

diff --git a/lib/token-bucket.h b/lib/token-bucket.h
deleted file mode 100644 (file)
index ef2b1ae..0000000
--- a/lib/token-bucket.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2012 Nicira, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TOKEN_BUCKET_H
-#define TOKEN_BUCKET_H 1
-
-#include <limits.h>
-#include <stdbool.h>
-
-struct token_bucket {
-    /* Configuration settings. */
-    unsigned int rate;          /* Tokens added per millisecond. */
-    unsigned int burst;         /* Max cumulative tokens credit. */
-
-    /* Current status. */
-    unsigned int tokens;        /* Current number of tokens. */
-    long long int last_fill;    /* Last time tokens added. */
-};
-
-#define TOKEN_BUCKET_INIT(RATE, BURST) { RATE, BURST, 0, LLONG_MIN }
-
-void token_bucket_init(struct token_bucket *,
-                       unsigned int rate, unsigned int burst);
-void token_bucket_set(struct token_bucket *,
-                       unsigned int rate, unsigned int burst);
-bool token_bucket_withdraw(struct token_bucket *, unsigned int n);
-void token_bucket_wait(struct token_bucket *, unsigned int n);
-
-#endif /* token-bucket.h */

diff --git a/lib/vlog.h b/lib/vlog.h
index d0ada03..67d37eb 100644 (file)
--- a/lib/vlog.h
+++ b/lib/vlog.h
@@ -33,7 +33,7 @@
 #include "compiler.h"
 #include "ovs-thread.h"
 #include "sat-math.h"
-#include "token-bucket.h"
+#include "openvswitch/token-bucket.h"
 #include "util.h"
 #include "list.h"
 

diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c
index 351623d..d769a53 100644 (file)
--- a/ofproto/pinsched.c
+++ b/ofproto/pinsched.c
@@ -31,7 +31,7 @@
 #include "rconn.h"
 #include "sat-math.h"
 #include "timeval.h"
-#include "token-bucket.h"
+#include "openvswitch/token-bucket.h"
 #include "vconn.h"
 
 struct pinqueue {