From ffe230a9c206566a3b184380431102e93c114ac9 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 24 Dec 2009 22:22:22 +0000 Subject: [PATCH] speed up policy compile (changes in libfwbuilder:r499) --- build_num | 2 +- src/ipt/ipt.cpp | 8 ++++---- src/iptlib/CompilerDriver_ipt_run.cpp | 1 + test/ipt/objects-for-regression-tests.fwb | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build_num b/build_num index b1103de5b..c3110a2d2 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2265 +#define BUILD_NUM 2267 diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp index 87ae3b54c..da5460a82 100644 --- a/src/ipt/ipt.cpp +++ b/src/ipt/ipt.cpp @@ -134,16 +134,16 @@ int main(int argc, char **argv) /* load the data file */ UpgradePredicate upgrade_predicate; - cout << " *** Loading data ..."; - cout << flush; + cerr << " *** Loading data ..."; + cerr << flush; objdb->setReadOnly( false ); objdb->load( filename, &upgrade_predicate, librespath); objdb->setFileName(filename); objdb->reIndex(); - cout << " done\n"; - cout << flush; + cerr << " done\n"; + cerr << flush; FWObject *slib = objdb->findInIndex(FWObjectDatabase::STANDARD_LIB_ID); if (slib && slib->isReadOnly()) slib->setReadOnly(false); diff --git a/src/iptlib/CompilerDriver_ipt_run.cpp b/src/iptlib/CompilerDriver_ipt_run.cpp index c1f6cd90e..5d18a9cdf 100644 --- a/src/iptlib/CompilerDriver_ipt_run.cpp +++ b/src/iptlib/CompilerDriver_ipt_run.cpp @@ -276,6 +276,7 @@ string CompilerDriver_ipt::run(const std::string &cluster_id, { Preprocessor* prep = new Preprocessor( objdb , fw, ipv6_policy); + prep->setSingleRuleCompileMode(single_rule_id); if (inTestMode()) prep->setTestMode(); if (inEmbeddedMode()) prep->setEmbeddedMode(); prep->compile(); diff --git a/test/ipt/objects-for-regression-tests.fwb b/test/ipt/objects-for-regression-tests.fwb index 0b7b5b8bd..917f556a8 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -20268,7 +20268,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - +