-#define SQUID_UNIT_TEST 1
-#include "squid.h"
+/*
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+#include "squid.h"
#include "ConfigParser.h"
#include "DiskIO/DiskIOModule.h"
+#include "fde.h"
#include "fs/rock/RockSwapDir.h"
#include "globals.h"
#include "HttpHeader.h"
#include "HttpReply.h"
-#include "Mem.h"
#include "MemObject.h"
#include "RequestFlags.h"
#include "SquidConfig.h"
#include "Store.h"
+#include "store/Disk.h"
+#include "store/Disks.h"
#include "StoreFileSystem.h"
#include "StoreSearch.h"
-#include "SwapDir.h"
#include "testRock.h"
#include "testStoreSupport.h"
+#include "unitTestMain.h"
+#include <stdexcept>
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#if HAVE_STDEXCEPT
-#include <stdexcept>
-#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#define TESTDIR "testRock_Store"
+#define TESTDIR "tr"
CPPUNIT_TEST_SUITE_REGISTRATION( testRock );
static void
addSwapDir(testRock::SwapDirPointer aStore)
{
- allocate_new_swapdir(&Config.cacheSwap);
+ allocate_new_swapdir(Config.cacheSwap);
Config.cacheSwap.swapDirs[Config.cacheSwap.n_configured] = aStore.getRaw();
++Config.cacheSwap.n_configured;
}
if (0 > system ("rm -rf " TESTDIR))
throw std::runtime_error("Failed to clean test work directory");
+ Config.memShared.defaultTo(false);
+ Config.shmLocking.defaultTo(false);
+
// use current directory for shared segments (on path-based OSes)
Ipc::Mem::Segment::BasePath = getcwd(cwd,MAXPATHLEN);
if (Ipc::Mem::Segment::BasePath == NULL)
Ipc::Mem::Segment::BasePath = ".";
- Store::Root(new StoreController);
+ Store::Init();
store = new Rock::SwapDir();
store->create();
rr = new Rock::SwapDirRr;
- rr->run(rrAfterConfig);
+ rr->useConfig();
}
void
{
CPPUNIT_NS::TestFixture::tearDown();
- Store::Root(NULL);
+ Store::FreeMemory();
store = NULL;
free_cachedir(&Config.cacheSwap);
- delete rr;
+ rr->finishShutdown(); // deletes rr
+ rr = NULL;
// TODO: do this once, or each time.
// safe_free(Config.replPolicy->type);
StoreFileSystem::SetupAllFs();
Config.Store.avgObjectSize = 1024;
-
Config.Store.objectsPerBucket = 20;
-
Config.Store.maxObjectSize = 2048;
Config.store_dir_select_algorithm = xstrdup("round-robin");
Config.replPolicy = new RemovalPolicySettings;
-
- Config.replPolicy->type = xstrdup ("lru");
-
+ Config.replPolicy->type = xstrdup("lru");
Config.replPolicy->args = NULL;
/* garh garh */
Mem::Init();
- comm_init();
+ fde::Init();
- httpHeaderInitModule(); /* must go before any header processing (e.g. the one in errorInitialize) */
+ comm_init();
- httpReplyInitModule(); /* must go before accepting replies */
+ httpHeaderInitModule(); /* must go before any header processing (e.g. the one in errorInitialize) */
mem_policy = createRemovalPolicy(Config.replPolicy);
*/
/* nothing left to rebuild */
- CPPUNIT_ASSERT_EQUAL(1, StoreController::store_dirs_rebuilding);
+ CPPUNIT_ASSERT_EQUAL(0, StoreController::store_dirs_rebuilding);
+}
+
+static const char *
+storeId(const int i)
+{
+ static char buf[64];
+ snprintf(buf, sizeof(buf), "dummy url %i", i);
+ buf[sizeof(buf) - 1] = '\0';
+ return buf;
}
StoreEntry *
{
RequestFlags flags;
flags.cachable = true;
- char url[64];
- snprintf(url, sizeof(url), "dummy url %i", i);
- url[sizeof(url) - 1] = '\0';
StoreEntry *const pe =
- storeCreateEntry(url, "dummy log url", flags, Http::METHOD_GET);
- HttpReply *const rep = const_cast<HttpReply *>(pe->getReply());
- rep->setHeaders(Http::scOkay, "dummy test object", "x-squid-internal/test", 0, -1, squid_curtime + 100000);
+ storeCreateEntry(storeId(i), "dummy log url", flags, Http::METHOD_GET);
+ auto &rep = pe->mem().adjustableBaseReply();
+ rep.setHeaders(Http::scOkay, "dummy test object", "x-squid-internal/test", 0, -1, squid_curtime + 100000);
pe->setPublicKey();
StoreEntry *const pe = createEntry(i);
pe->buffer();
- /* TODO: remove this when the metadata is separated */
- {
- Packer p;
- packerToStoreInit(&p, pe);
- pe->getReply()->packHeadersInto(&p);
- packerClean(&p);
- }
-
+ pe->mem().freshestReply().packHeadersUsingSlowPacker(*pe);
pe->flush();
pe->timestampsSet();
pe->complete();
StoreEntry *
testRock::getEntry(const int i)
{
- StoreEntry *const pe = createEntry(i);
- return store->get(reinterpret_cast<const cache_key *>(pe->key));
+ return storeGetPublic(storeId(i), Http::METHOD_GET);
}
void
CPPUNIT_ASSERT_EQUAL(SWAPOUT_DONE, pe->swap_status);
- pe->unlock();
+ pe->unlock("testRock::testRockSwapOut priming");
}
CPPUNIT_ASSERT_EQUAL((uint64_t)5, store->currentCount());
// try to swap out entry to a used unlocked slot
{
- StoreEntry *const pe = addEntry(4);
+ // without marking the old entry as deleted
+ StoreEntry *const pe = addEntry(3);
- CPPUNIT_ASSERT_EQUAL(SWAPOUT_WRITING, pe->swap_status);
- CPPUNIT_ASSERT_EQUAL(0, pe->swap_dirn);
- CPPUNIT_ASSERT(pe->swap_filen >= 0);
+ CPPUNIT_ASSERT_EQUAL(SWAPOUT_NONE, pe->swap_status);
+ CPPUNIT_ASSERT_EQUAL(-1, pe->swap_dirn);
+ CPPUNIT_ASSERT_EQUAL(-1, pe->swap_filen);
+ pe->unlock("testRock::testRockSwapOut e#3");
+
+ // after marking the old entry as deleted
+ StoreEntry *const pe2 = getEntry(4);
+ CPPUNIT_ASSERT(pe2 != nullptr);
+ pe2->release();
+
+ StoreEntry *const pe3 = addEntry(4);
+ CPPUNIT_ASSERT_EQUAL(SWAPOUT_WRITING, pe3->swap_status);
+ CPPUNIT_ASSERT_EQUAL(0, pe3->swap_dirn);
+ CPPUNIT_ASSERT(pe3->swap_filen >= 0);
StockEventLoop loop;
loop.run();
- CPPUNIT_ASSERT_EQUAL(SWAPOUT_DONE, pe->swap_status);
+ CPPUNIT_ASSERT_EQUAL(SWAPOUT_DONE, pe3->swap_status);
+
+ pe->unlock("testRock::testRockSwapOut e#4");
}
// try to swap out entry to a used locked slot
StockEventLoop loop;
loop.run();
+
+ pe->unlock("testRock::testRockSwapOut e#5.1");
+ pe2->unlock("testRock::testRockSwapOut e#5.2");
+
+ // pe2 has the same public key as pe so it marks old pe for release
+ // here, we add another entry #5 into the now-available slot
+ StoreEntry *const pe3 = addEntry(5);
+ CPPUNIT_ASSERT_EQUAL(SWAPOUT_WRITING, pe3->swap_status);
+ CPPUNIT_ASSERT_EQUAL(0, pe3->swap_dirn);
+ CPPUNIT_ASSERT(pe3->swap_filen >= 0);
+ loop.run();
+ CPPUNIT_ASSERT_EQUAL(SWAPOUT_DONE, pe3->swap_status);
+ pe3->unlock("testRock::testRockSwapOut e#5.3");
}
CPPUNIT_ASSERT_EQUAL((uint64_t)6, store->currentCount());
- // try to get and unlink entries
+ // try to get and release all entries
for (int i = 0; i < 6; ++i) {
StoreEntry *const pe = getEntry(i);
CPPUNIT_ASSERT(pe != NULL);
- pe->unlink();
+ pe->release(); // destroys pe
StoreEntry *const pe2 = getEntry(i);
CPPUNIT_ASSERT_EQUAL(static_cast<StoreEntry *>(NULL), pe2);
}
}
+
projects / thirdparty / squid.git / blobdiff