[squid-dev] [PATCH] libsbuf

Amos Jeffries squid3 at treenet.co.nz
Thu Feb 25 17:50:46 UTC 2016


On 26/02/2016 6:01 a.m., Kinkie wrote:
> Hi all,
>   please find attached a the bundle implementing libsbuf (merge
> proposal from lp:~squid/squid/sbuflab).
> 
> It:
> - shuffles SBuf core files into src/sbuf and implements sbuf/libsbuf.la
> - refactors SBuf <-> String adaption functions into a separate header,
> increasing decoupling
> - reduces the list of stubs and libraries needed for SBuf unit tests
> - removes _DEPENDENCIES clauses from affected unit tests' Makefile.am
> 
> It has to be a bundle to carry information about file moves; this
> means no long-context diff, I'm sorry.
> Code builds fine in-tree. I'll perform a full test before possibly
> merging if you approve the patch, of course.
> 

I think all the stats.allocFromString accounting could stay. It would
just be for std::string now instead of combined std::string and SquidString.

OR, maybe the String to/from counting could be done by the
SBufStringConvert.h functions instead of the SBuf.


in src/Makefile.am:
* tests_testSBuf_LDADD needs to include $(SQUID_CPPUNIT_LA)
 - same for tests_testSBufList_LDADD and tests_testLookupTable_LDADD


in src/mk-string-arrays.awk:
* can you take advantage of the edit to s/namesapce/namespace/ please?


in src/sbuf/SBufStringConvert.h:
* use:  #include "sbuf/SBuf.h"


in src/tests/testSBuf.cc:
* use: #include "tests/SBufFindTest.h"


Amos



More information about the squid-dev mailing list