loci: move parsing functions out of the headers
These did not need to be inlined. Moved to of_type_maps.c, which is combined
with the old of_type_data.c to get all the necessary macros in one place.
diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
index eb2c665..3621507 100644
--- a/c_gen/c_code_gen.py
+++ b/c_gen/c_code_gen.py
@@ -424,8 +424,37 @@
* Declarations of maps between on-the-wire type values and LOCI identifiers
*
****************************************************************/
+
+/**
+ * Generic experimenter type value. Applies to all except
+ * top level message: Action, instruction, error, stats, queue_props, oxm
+ */
+#define OF_EXPERIMENTER_TYPE 0xffff
+
+int of_experimenter_stats_request_to_object_id(uint32_t experimenter, uint32_t subtype, int ver);
+int of_experimenter_stats_reply_to_object_id(uint32_t experimenter, uint32_t subtype, int ver);
+
+of_object_id_t of_action_to_object_id(int action, of_version_t version);
+of_object_id_t of_action_id_to_object_id(int action_id, of_version_t version);
+of_object_id_t of_instruction_to_object_id(int instruction, of_version_t version);
+of_object_id_t of_queue_prop_to_object_id(int queue_prop, of_version_t version);
+of_object_id_t of_table_feature_prop_to_object_id(int table_feature_prop, of_version_t version);
+of_object_id_t of_meter_band_to_object_id(int meter_band, of_version_t version);
+of_object_id_t of_hello_elem_to_object_id(int hello_elem, of_version_t version);
+of_object_id_t of_stats_reply_to_object_id(int stats_reply, of_version_t version);
+of_object_id_t of_stats_request_to_object_id(int stats_request, of_version_t version);
+of_object_id_t of_error_msg_to_object_id(uint16_t error_msg, of_version_t version);
+of_object_id_t of_flow_mod_to_object_id(int flow_mod, of_version_t version);
+of_object_id_t of_group_mod_to_object_id(int group_mod, of_version_t version);
+of_object_id_t of_oxm_to_object_id(uint32_t type_len, of_version_t version);
+of_object_id_t of_message_experimenter_to_object_id(of_message_t msg, of_version_t version);
+of_object_id_t of_message_to_object_id(of_message_t msg, int length);
+
+int of_object_wire_init(of_object_t *obj, of_object_id_t base_object_id, int max_len);
+
+extern const int *const of_object_fixed_len[OF_VERSION_ARRAY_MAX];
+extern const int *const of_object_extra_len[OF_VERSION_ARRAY_MAX];
""")
- c_type_maps.gen_type_maps_header(out)
c_type_maps.gen_type_data_header(out)
c_match.gen_declarations(out)
# @fixme Move debug stuff to own fn
@@ -460,12 +489,6 @@
c_match.gen_serialize(out)
c_match.gen_deserialize(out)
-def type_data_c_gen(out, name):
- common_top_matter(out, name)
- c_type_maps.gen_type_maps(out)
- c_type_maps.gen_length_array(out)
- c_type_maps.gen_extra_length_array(out)
-
################################################################
# Top Matter
################################################################
diff --git a/c_gen/c_type_maps.py b/c_gen/c_type_maps.py
index f1a427a..06161ec 100644
--- a/c_gen/c_type_maps.py
+++ b/c_gen/c_type_maps.py
@@ -105,8 +105,6 @@
@param out The file handle to write to
"""
- out.write("#include <loci/loci.h>\n\n")
-
# Generate maps from wire type values to object IDs
gen_type_to_object_id(out, "error_msg_type_to_id", "OF_ERROR_MSG",
"OF_%s_ERROR_MSG", type_maps.error_types,
@@ -155,7 +153,7 @@
def gen_type_to_obj_map_functions(out):
"""
- Generate the templated static inline type map functions
+ Generate the templated type map functions
@param out The file handle to write to
"""
@@ -180,7 +178,7 @@
* @return OF_OBJECT_INVALID if type does not map to an object
*
*/
-static inline of_object_id_t
+of_object_id_t
of_%(name)s_to_object_id(int %(name)s, of_version_t version)
{
if (!OF_VERSION_OKAY(version)) {
@@ -211,7 +209,7 @@
* @return OF_OBJECT_INVALID if type does not map to an object
*
*/
-static inline of_object_id_t
+of_object_id_t
of_%(name)s_to_object_id(int %(name)s, of_version_t version)
{
if (!OF_VERSION_OKAY(version)) {
@@ -246,7 +244,7 @@
* @return OF_OBJECT_INVALID if type does not map to an object
*
*/
-static inline of_object_id_t
+of_object_id_t
of_%(name)s_to_object_id(int %(name)s, of_version_t version)
{
if (!OF_VERSION_OKAY(version)) {
@@ -281,7 +279,7 @@
* @return OF_OBJECT_INVALID if type does not map to an object
*
*/
-static inline of_object_id_t
+of_object_id_t
of_error_msg_to_object_id(uint16_t %(name)s, of_version_t version)
{
if (!OF_VERSION_OKAY(version)) {
@@ -315,7 +313,7 @@
* @todo put OF_EXPERIMENTER_<name> in loci_base.h
*/
-static inline of_object_id_t
+of_object_id_t
of_message_experimenter_to_object_id(of_message_t msg, of_version_t version) {
uint32_t experimenter_id;
uint32_t subtype;
@@ -365,7 +363,7 @@
* @returns object ID or OF_OBJECT_INVALID if parse error
*/
-static inline of_object_id_t
+of_object_id_t
of_message_to_object_id(of_message_t msg, int length) {
uint8_t type;
of_version_t ver;
@@ -471,7 +469,7 @@
* @return OF_OBJECT_INVALID if type does not map to an object
*
*/
-static inline of_object_id_t
+of_object_id_t
of_oxm_to_object_id(uint32_t type_len, of_version_t version)
{
if (!OF_VERSION_OKAY(version)) {
@@ -590,89 +588,6 @@
out.write(msg_template %
dict(name="message", u_name="MESSAGE", ar_len=ar_len))
-def gen_type_maps_header(out):
- """
- Generate various header file declarations for type maps
- @param out The file handle to write to
- """
-
- out.write("""
-/**
- * Generic experimenter type value. Applies to all except
- * top level message: Action, instruction, error, stats, queue_props, oxm
- */
-#define OF_EXPERIMENTER_TYPE 0xffff
-
-int of_experimenter_stats_request_to_object_id(uint32_t experimenter, uint32_t subtype, int ver);
-int of_experimenter_stats_reply_to_object_id(uint32_t experimenter, uint32_t subtype, int ver);
-""")
- gen_type_to_obj_map_functions(out)
-
- out.write("extern const int *const of_object_fixed_len[OF_VERSION_ARRAY_MAX];\n")
- out.write("extern const int *const of_object_extra_len[OF_VERSION_ARRAY_MAX];\n")
-
- out.write("""
-/**
- * Map a message in a wire buffer object to its OF object id.
- * @param wbuf Pointer to a wire buffer object, populated with an OF message
- * @returns The object ID of the message
- * @returns OF_OBJECT_INVALID if unable to parse the message type
- */
-
-static inline of_object_id_t
-of_wire_object_id_get(of_wire_buffer_t *wbuf)
-{
- of_message_t msg;
-
- msg = (of_message_t)WBUF_BUF(wbuf);
- return of_message_to_object_id(msg, WBUF_CURRENT_BYTES(wbuf));
-}
-
-/**
- * Use the type/length from the wire buffer and init the object
- * @param obj The object being initialized
- * @param base_object_id If > 0, this indicates the base object
- * @param max_len If > 0, the max length to expect for the obj
- * type for inheritance checking
- * @return OF_ERROR_
- *
- * Used for inheritance type objects such as actions and OXMs
- * The type is checked and if valid, the object is initialized.
- * Then the length is taken from the buffer.
- *
- * Note that the object version must already be properly set.
- */
-static inline int
-of_object_wire_init(of_object_t *obj, of_object_id_t base_object_id,
- int max_len)
-{
- if (obj->wire_type_get != NULL) {
- of_object_id_t id;
- obj->wire_type_get(obj, &id);
- if (!of_wire_id_valid(id, base_object_id)) {
- return OF_ERROR_PARSE;
- }
- obj->object_id = id;
- /* Call the init function for this object type; do not push to wire */
- of_object_init_map[id]((of_object_t *)(obj), obj->version, -1, 0);
- }
- if (obj->wire_length_get != NULL) {
- int length;
- obj->wire_length_get(obj, &length);
- if (length < 0 || (max_len > 0 && length > max_len)) {
- return OF_ERROR_PARSE;
- }
- obj->length = length;
- } else {
- /* @fixme Does this cover everything else? */
- obj->length = of_object_fixed_len[obj->version][base_object_id];
- }
-
- return OF_ERROR_NONE;
-}
-
-""")
-
def gen_type_data_header(out):
out.write("""
diff --git a/c_gen/codegen.py b/c_gen/codegen.py
index 92d0f11..2bc62ca 100644
--- a/c_gen/codegen.py
+++ b/c_gen/codegen.py
@@ -41,6 +41,7 @@
import c_code_gen
import c_gen.of_g_legacy as of_g
import c_gen.type_maps as type_maps
+import c_gen.c_type_maps as c_type_maps
PushWireTypesData = namedtuple('PushWireTypesData',
['class_name', 'versioned_type_members'])
@@ -131,3 +132,14 @@
def generate_init_map(install_dir):
with template_utils.open_output(install_dir, "loci/src/loci_init_map.c") as out:
util.render_template(out, "loci_init_map.c", classes=of_g.standard_class_order)
+
+def generate_type_maps(install_dir):
+ # Collect legacy code
+ tmp = StringIO()
+ c_type_maps.gen_type_to_obj_map_functions(tmp)
+ c_type_maps.gen_type_maps(tmp)
+ c_type_maps.gen_length_array(tmp)
+ c_type_maps.gen_extra_length_array(tmp)
+
+ with template_utils.open_output(install_dir, "loci/src/of_type_maps.c") as out:
+ util.render_template(out, "of_type_maps.c", legacy_code=tmp.getvalue())
diff --git a/c_gen/templates/of_object.c b/c_gen/templates/of_object.c
index 5523cfc..9b1bafd 100644
--- a/c_gen/templates/of_object.c
+++ b/c_gen/templates/of_object.c
@@ -551,6 +551,49 @@
}
}
+/**
+ * Use the type/length from the wire buffer and init the object
+ * @param obj The object being initialized
+ * @param base_object_id If > 0, this indicates the base object
+ * @param max_len If > 0, the max length to expect for the obj
+ * type for inheritance checking
+ * @return OF_ERROR_
+ *
+ * Used for inheritance type objects such as actions and OXMs
+ * The type is checked and if valid, the object is initialized.
+ * Then the length is taken from the buffer.
+ *
+ * Note that the object version must already be properly set.
+ */
+int
+of_object_wire_init(of_object_t *obj, of_object_id_t base_object_id,
+ int max_len)
+{
+ if (obj->wire_type_get != NULL) {
+ of_object_id_t id;
+ obj->wire_type_get(obj, &id);
+ if (!of_wire_id_valid(id, base_object_id)) {
+ return OF_ERROR_PARSE;
+ }
+ obj->object_id = id;
+ /* Call the init function for this object type; do not push to wire */
+ of_object_init_map[id]((of_object_t *)(obj), obj->version, -1, 0);
+ }
+ if (obj->wire_length_get != NULL) {
+ int length;
+ obj->wire_length_get(obj, &length);
+ if (length < 0 || (max_len > 0 && length > max_len)) {
+ return OF_ERROR_PARSE;
+ }
+ obj->length = length;
+ } else {
+ /* @fixme Does this cover everything else? */
+ obj->length = of_object_fixed_len[obj->version][base_object_id];
+ }
+
+ return OF_ERROR_NONE;
+}
+
/*
* Set member:
* get_wbuf_extent
diff --git a/c_gen/templates/of_type_maps.c b/c_gen/templates/of_type_maps.c
index 4b35dcc..7310988 100644
--- a/c_gen/templates/of_type_maps.c
+++ b/c_gen/templates/of_type_maps.c
@@ -40,6 +40,8 @@
#define OF_INSTRUCTION_EXPERIMENTER_ID_OFFSET 4
#define OF_INSTRUCTION_EXPERIMENTER_SUBTYPE_OFFSET 8
+${legacy_code}
+
/****************************************************************
* Top level OpenFlow message length functions
****************************************************************/
diff --git a/lang_c.py b/lang_c.py
index c0e44f8..0a881e9 100644
--- a/lang_c.py
+++ b/lang_c.py
@@ -72,7 +72,6 @@
'loci/inc/loci/of_wire_buf.h': static,
# LOCI code
- 'loci/src/of_type_data.c': c_code_gen.type_data_c_gen,
'loci/src/of_match.c': c_code_gen.match_c_gen,
'loci/src/loci_obj_dump.c': c_dump_gen.gen_obj_dump_c,
'loci/src/loci_obj_show.c': c_show_gen.gen_obj_show_c,
@@ -83,7 +82,6 @@
'loci/src/loci_log.c': static,
'loci/src/loci_log.h': static,
'loci/src/of_object.c': static,
- 'loci/src/of_type_maps.c': static,
'loci/src/of_utils.c': static,
'loci/src/of_wire_buf.c': static,
'loci/src/loci_setup_from_add_fns.c': static,
@@ -132,3 +130,4 @@
c_gen.codegen.generate_lists(install_dir)
c_gen.codegen.generate_strings(install_dir)
c_gen.codegen.generate_init_map(install_dir)
+ c_gen.codegen.generate_type_maps(install_dir)