From patchwork Thu Oct 6 03:16:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 678719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3sqHrk0HD9z9sQw for ; Thu, 6 Oct 2016 14:17:25 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id A0422108F2; Wed, 5 Oct 2016 20:17:00 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 8FF5D108DE for ; Wed, 5 Oct 2016 20:16:59 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 293E9161510 for ; Wed, 5 Oct 2016 21:16:59 -0600 (MDT) X-ASG-Debug-ID: 1475723818-0b3237258a613a0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar6.cudamail.com with ESMTP id x9wrKzFSXOmAbmf0 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 05 Oct 2016 21:16:58 -0600 (MDT) X-Barracuda-Envelope-From: blp@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO relay3-d.mail.gandi.net) (217.70.183.195) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 6 Oct 2016 03:16:58 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at ovn.org designates 217.70.183.195 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.195 X-Barracuda-RBL-IP: 217.70.183.195 Received: from mfilter22-d.gandi.net (mfilter22-d.gandi.net [217.70.178.150]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id C0F49A80CB; Thu, 6 Oct 2016 05:16:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter22-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter22-d.gandi.net (mfilter22-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 1DvHNDkaDcuL; Thu, 6 Oct 2016 05:16:55 +0200 (CEST) X-Originating-IP: 173.228.112.90 Received: from sigabrt.gateway.sonic.net (173-228-112-90.dsl.dynamic.fusionbroadband.com [173.228.112.90]) (Authenticated sender: blp@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 65B65A80CF; Thu, 6 Oct 2016 05:16:54 +0200 (CEST) X-CudaMail-Envelope-Sender: blp@ovn.org From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1004064230 X-CudaMail-DTE: 100516 X-CudaMail-Originating-IP: 217.70.183.195 Date: Wed, 5 Oct 2016 20:16:42 -0700 X-ASG-Orig-Subj: [##CM-V3-1004064230##][PATCH 05/15] ovsdb-idlc: Make generated references to table classes easier to read. Message-Id: <1475723812-20932-5-git-send-email-blp@ovn.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1475723812-20932-1-git-send-email-blp@ovn.org> References: <1475723812-20932-1-git-send-email-blp@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1475723818 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 05/15] ovsdb-idlc: Make generated references to table classes easier to read. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" This replaces &ovsrec_table_classes[OVSREC_TABLE_OPEN_VSWITCH] by the easier to read and equivalent &ovsrec_table_open_vswitch in generated code. Signed-off-by: Ben Pfaff --- ovsdb/ovsdb-idlc.in | 57 +++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in index 90a5ddb..73e7cf8 100755 --- a/ovsdb/ovsdb-idlc.in +++ b/ovsdb/ovsdb-idlc.in @@ -372,13 +372,13 @@ static void if not type.key.ref_table: print " %s = datum->keys[0].%s;" % (keyVar, type.key.type.to_string()) else: - print " %s = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_classes[%sTABLE_%s], &datum->keys[0].uuid));" % (keyVar, prefix, type.key.ref_table.name.lower(), prefix, prefix.upper(), type.key.ref_table.name.upper()) + print " %s = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_%s, &datum->keys[0].uuid));" % (keyVar, prefix, type.key.ref_table.name.lower(), prefix, type.key.ref_table.name.lower()) if valueVar: if not type.value.ref_table: print " %s = datum->values[0].%s;" % (valueVar, type.value.type.to_string()) else: - print " %s = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_classes[%sTABLE_%s], &datum->values[0].uuid));" % (valueVar, prefix, type.value.ref_table.name.lower(), prefix, prefix.upper(), type.value.ref_table.name.upper()) + print " %s = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_%s, &datum->values[0].uuid));" % (valueVar, prefix, type.value.ref_table.name.lower(), prefix, type.value.ref_table.name.lower()) print " } else {" print " %s" % type.key.initCDefault(keyVar, type.n_min == 0) if valueVar: @@ -400,21 +400,21 @@ static void print " for (i = 0; i < %s; i++) {" % nMax if type.key.ref_table: print """\ - struct %s%s *keyRow = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_classes[%sTABLE_%s], &datum->keys[i].uuid)); + struct %s%s *keyRow = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_%s, &datum->keys[i].uuid)); if (!keyRow) { continue; }\ -""" % (prefix, type.key.ref_table.name.lower(), prefix, type.key.ref_table.name.lower(), prefix, prefix.upper(), type.key.ref_table.name.upper()) +""" % (prefix, type.key.ref_table.name.lower(), prefix, type.key.ref_table.name.lower(), prefix, type.key.ref_table.name.lower()) keySrc = "keyRow" else: keySrc = "datum->keys[i].%s" % type.key.type.to_string() if type.value and type.value.ref_table: print """\ - struct %s%s *valueRow = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_classes[%sTABLE_%s], &datum->values[i].uuid)); + struct %s%s *valueRow = %s%s_cast(ovsdb_idl_get_row_arc(row_, &%stable_%s, &datum->values[i].uuid)); if (!valueRow) { continue; }\ -""" % (prefix, type.value.ref_table.name.lower(), prefix, type.value.ref_table.name.lower(), prefix, prefix.upper(), type.value.ref_table.name.upper()) +""" % (prefix, type.value.ref_table.name.lower(), prefix, type.value.ref_table.name.lower(), prefix, type.value.ref_table.name.lower()) valueSrc = "valueRow" elif valueVar: valueSrc = "datum->values[i].%s" % type.value.type.to_string() @@ -505,7 +505,7 @@ void const struct %(s)s * %(s)s_get_for_uuid(const struct ovsdb_idl *idl, const struct uuid *uuid) { - return %(s)s_cast(ovsdb_idl_get_row_for_uuid(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], uuid)); + return %(s)s_cast(ovsdb_idl_get_row_for_uuid(idl, &%(p)stable_%(tl)s, uuid)); } /* Returns a row in table "%(t)s" in 'idl', or a null pointer if that @@ -517,7 +517,7 @@ const struct %(s)s * const struct %(s)s * %(s)s_first(const struct ovsdb_idl *idl) { - return %(s)s_cast(ovsdb_idl_first_row(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s])); + return %(s)s_cast(ovsdb_idl_first_row(idl, &%(p)stable_%(tl)s)); } /* Returns a row following 'row' within its table, or a null pointer if 'row' @@ -530,7 +530,7 @@ const struct %(s)s * unsigned int %(s)s_get_seqno(const struct ovsdb_idl *idl) { - return ovsdb_idl_table_get_seqno(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s]); + return ovsdb_idl_table_get_seqno(idl, &%(p)stable_%(tl)s); } unsigned int %(s)s_row_get_seqno(const struct %(s)s *row, enum ovsdb_idl_change change) @@ -541,7 +541,7 @@ unsigned int %(s)s_row_get_seqno(const struct %(s)s *row, enum ovsdb_idl_change const struct %(s)s * %(s)s_track_get_first(const struct ovsdb_idl *idl) { - return %(s)s_cast(ovsdb_idl_track_get_first(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s])); + return %(s)s_cast(ovsdb_idl_track_get_first(idl, &%(p)stable_%(tl)s)); } const struct %(s)s @@ -552,6 +552,7 @@ const struct %(s)s 'p': prefix, 'P': prefix.upper(), 't': tableName, + 'tl': tableName.lower(), 'T': tableName.upper()} print ''' @@ -576,7 +577,7 @@ void struct %(s)s * %(s)s_insert(struct ovsdb_idl_txn *txn) { - return %(s)s_cast(ovsdb_idl_txn_insert(txn, &%(p)stable_classes[%(P)sTABLE_%(T)s], NULL)); + return %(s)s_cast(ovsdb_idl_txn_insert(txn, &%(p)stable_%(tl)s, NULL)); } bool @@ -587,6 +588,7 @@ bool 'p': prefix, 'P': prefix.upper(), 't': tableName, + 'tl': tableName.lower(), 'T': tableName.upper()} # Verify functions. @@ -928,7 +930,7 @@ void } ovsdb_idl_condition_add_clause(idl, - &%(p)stable_classes[%(P)sTABLE_%(T)s], + &%(p)stable_%(tl)s, function, &%(s)s_columns[%(S)s_COL_%(C)s], &datum); @@ -936,6 +938,7 @@ void ovsdb_datum_destroy(&datum, &%(s)s_col_%(c)s.type); } """ % {'t': tableName, + 'tl': tableName.lower(), 'T': tableName.upper(), 'p': prefix, 'P': prefix.upper(), @@ -1028,11 +1031,11 @@ void print " ovsdb_datum_sort_unique(&datum, %s, %s);" % ( type.key.toAtomicType(), valueType) - print""" ovsdb_idl_condition_add_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], + print""" ovsdb_idl_condition_add_clause(idl, &%(p)stable_%(tl)s, function, &%(s)s_columns[%(S)s_COL_%(C)s], &datum);\ -""" % {'t': tableName, +""" % {'tl': tableName.lower(), 'T': tableName.upper(), 'p': prefix, 'P': prefix.upper(), @@ -1050,9 +1053,9 @@ void struct ovsdb_datum datum; ovsdb_datum_init_empty(&datum); - ovsdb_idl_condition_add_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], OVSDB_F_FALSE, NULL, &datum); + ovsdb_idl_condition_add_clause(idl, &%(p)stable_%(tl)s, OVSDB_F_FALSE, NULL, &datum); }""" % {'s': structName, - 'T': tableName.upper(), + 'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper()} @@ -1062,9 +1065,9 @@ void struct ovsdb_datum datum; ovsdb_datum_init_empty(&datum); - ovsdb_idl_condition_add_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], OVSDB_F_TRUE, NULL, &datum); + ovsdb_idl_condition_add_clause(idl, &%(p)stable_%(tl)s, OVSDB_F_TRUE, NULL, &datum); }""" % {'s': structName, - 'T': tableName.upper(), + 'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper()} @@ -1089,15 +1092,14 @@ void ovsdb_datum_init_empty(&datum); } - ovsdb_idl_condition_remove_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], + ovsdb_idl_condition_remove_clause(idl, &%(p)stable_%(tl)s, function, &%(s)s_columns[%(S)s_COL_%(C)s], &datum); ovsdb_datum_destroy(&datum, &%(s)s_col_%(c)s.type); } -""" % {'t': tableName, - 'T': tableName.upper(), +""" % {'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper(), 's': structName, @@ -1189,12 +1191,11 @@ void print " ovsdb_datum_sort_unique(&datum, %s, %s);" % ( type.key.toAtomicType(), valueType) - print""" ovsdb_idl_condition_remove_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], + print""" ovsdb_idl_condition_remove_clause(idl, &%(p)stable_%(tl)s, function, &%(s)s_columns[%(S)s_COL_%(C)s], &datum);\ -""" % {'t': tableName, - 'T': tableName.upper(), +""" % {'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper(), 's': structName, @@ -1211,9 +1212,9 @@ void struct ovsdb_datum datum; ovsdb_datum_init_empty(&datum); - ovsdb_idl_condition_remove_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], OVSDB_F_FALSE, NULL, &datum); + ovsdb_idl_condition_remove_clause(idl, &%(p)stable_%(tl)s, OVSDB_F_FALSE, NULL, &datum); }""" % {'s': structName, - 'T': tableName.upper(), + 'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper()} @@ -1223,9 +1224,9 @@ void struct ovsdb_datum datum; ovsdb_datum_init_empty(&datum); - ovsdb_idl_condition_remove_clause(idl, &%(p)stable_classes[%(P)sTABLE_%(T)s], OVSDB_F_TRUE, NULL, &datum); + ovsdb_idl_condition_remove_clause(idl, &%(p)stable_%(tl)s, OVSDB_F_TRUE, NULL, &datum); }""" % {'s': structName, - 'T': tableName.upper(), + 'tl': tableName.lower(), 'p': prefix, 'P': prefix.upper(),}