/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* - OVS_REQUIRES(MUTEX) indicate that the function may only be called with
* MUTEX held and that the function does not release MUTEX.
*
- * - OVS_LOCKS_EXCLUDED(MUTEX) indicates that the function may only be
- * called when MUTEX is not held.
+ * - OVS_EXCLUDED(MUTEX) indicates that the function may only be called when
+ * MUTEX is not held.
*
*
* The following variants, with the same syntax, apply to reader-writer locks:
* OVS_RELEASES OVS_RELEASES OVS_RELEASES
* OVS_TRY_LOCK OVS_TRY_RDLOCK OVS_TRY_WRLOCK
* OVS_REQUIRES OVS_REQ_RDLOCK OVS_REQ_WRLOCK
- * OVS_LOCKS_EXCLUDED OVS_LOCKS_EXCLUDED OVS_LOCKS_EXCLUDED
+ * OVS_EXCLUDED OVS_EXCLUDED OVS_EXCLUDED
*/
#define OVS_LOCKABLE __attribute__((lockable))
#define OVS_REQ_RDLOCK(...) __attribute__((shared_locks_required(__VA_ARGS__)))
#define OVS_PACKED(DECL) __pragma(pack(push, 1)) DECL __pragma(pack(pop))
#endif
+/* For defining a structure whose instances should aligned on an N-byte
+ * boundary.
+ *
+ * e.g. The following:
+ * OVS_ALIGNED_STRUCT(64, mystruct) { ... };
+ * is equivalent to the following except that it specifies 64-byte alignment:
+ * struct mystruct { ... };
+ */
+#ifndef _MSC_VER
+#define OVS_ALIGNED_STRUCT(N, TAG) struct __attribute__((aligned(N))) TAG
+#else
+#define OVS_ALIGNED_STRUCT(N, TAG) __declspec(align(N)) struct TAG
+#endif
+
#ifdef _MSC_VER
#define CCALL __cdecl
#pragma section(".CRT$XCU",read)