Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
This approach isn't used anymore. Now we start the archive building with parameters to pyrogeneis. Refs #2241 (the code used g_ScriptingHost which is going to be removed) This was SVN commit r14102.
This commit is contained in:
parent
87e9c5694e
commit
93cffe9deb
@ -71,5 +71,4 @@ Archive builder:
|
||||
-archivebuild-output=PATH system PATH to output of the resulting .zip archive (use with archivebuild)
|
||||
-archivebuild-compress enable deflate compression in the .zip
|
||||
(no zip compression by default since it hurts compression of release packages)
|
||||
-buildarchive (disabled)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,42 +0,0 @@
|
||||
/* Copyright (c) 2010 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* automatically bundles files into archives in order of access to
|
||||
* optimize I/O.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_VFS_OPTIMIZER
|
||||
#define INCLUDED_VFS_OPTIMIZER
|
||||
|
||||
|
||||
extern Status vfs_opt_rebuild_main_archive(const char* trace_filename, const char* archive_fn_fmt);
|
||||
|
||||
extern void vfs_opt_auto_build_cancel();
|
||||
|
||||
extern int vfs_opt_auto_build(const char* trace_filename,
|
||||
const char* archive_fn_fmt, const char* mini_archive_fn_fmt, bool force_build = false);
|
||||
|
||||
extern void vfs_opt_notify_loose_file(const char* atom_fn);
|
||||
extern void vfs_opt_notify_archived_file(const char* atom_fn);
|
||||
|
||||
#endif // #ifndef INCLUDED_VFS_OPTIMIZER
|
||||
@ -1,166 +0,0 @@
|
||||
/* Copyright (c) 2010 Wildfire Games
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "lib/self_test.h"
|
||||
|
||||
#include "lib/base32.h"
|
||||
#include "lib/res/file/path.h"
|
||||
#include "lib/res/file/fp_posix.h"
|
||||
#include "lib/res/file/file_cache.h"
|
||||
#include "lib/res/file/vfs/vfs.h"
|
||||
#include "lib/res/file/archive/archive.h"
|
||||
#include "lib/res/file/archive/archive_builder.h"
|
||||
#include "lib/res/h_mgr.h"
|
||||
#include "lib/res/mem.h"
|
||||
#include "lib/rand.h"
|
||||
|
||||
class TestArchiveBuilder : public CxxTest::TestSuite
|
||||
{
|
||||
const char* const archive_fn;
|
||||
static const size_t NUM_FILES = 30;
|
||||
static const size_t MAX_FILE_SIZE = 20000;
|
||||
|
||||
std::set<const char*> existing_names;
|
||||
const char* gen_random_name()
|
||||
{
|
||||
// 10 chars is enough for (10-1)*5 bits = 45 bits > u32
|
||||
char name_tmp[10];
|
||||
|
||||
for(;;)
|
||||
{
|
||||
u32 rand_num = rand(0, 100000);
|
||||
base32(4, (const u8*)&rand_num, (u8*)name_tmp);
|
||||
|
||||
// store filename in atom pool
|
||||
const char* atom_fn = file_make_unique_fn_copy(name_tmp);
|
||||
// done if the filename is unique (not been generated yet)
|
||||
if(existing_names.find(atom_fn) == existing_names.end())
|
||||
{
|
||||
existing_names.insert(atom_fn);
|
||||
return atom_fn;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct TestFile
|
||||
{
|
||||
off_t size;
|
||||
u8* data; // must be delete[]-ed after comparing
|
||||
};
|
||||
// (must be separate array and end with NULL entry (see Filenames))
|
||||
const char* filenames[NUM_FILES+1];
|
||||
TestFile files[NUM_FILES];
|
||||
|
||||
void generate_random_files()
|
||||
{
|
||||
for(size_t i = 0; i < NUM_FILES; i++)
|
||||
{
|
||||
const off_t size = rand(0, MAX_FILE_SIZE);
|
||||
u8* data = new u8[size];
|
||||
|
||||
// random data won't compress at all, and we want to exercise
|
||||
// the uncompressed codepath as well => make some of the files
|
||||
// easily compressible (much less values).
|
||||
const bool make_easily_compressible = (rand(0, 100) > 50);
|
||||
if(make_easily_compressible)
|
||||
{
|
||||
for(off_t i = 0; i < size; i++)
|
||||
data[i] = rand() & 0x0F;
|
||||
}
|
||||
else
|
||||
{
|
||||
for(off_t i = 0; i < size; i++)
|
||||
data[i] = rand() & 0xFF;
|
||||
}
|
||||
|
||||
filenames[i] = gen_random_name();
|
||||
files[i].size = size;
|
||||
files[i].data = data;
|
||||
|
||||
ssize_t bytes_written = vfs_store(filenames[i], data, size, FILE_NO_AIO);
|
||||
TS_ASSERT_EQUALS(bytes_written, size);
|
||||
}
|
||||
|
||||
// 0-terminate the list - see Filenames decl.
|
||||
filenames[NUM_FILES] = NULL;
|
||||
}
|
||||
|
||||
public:
|
||||
TestArchiveBuilder()
|
||||
: archive_fn("test_archive_random_data.zip") {}
|
||||
|
||||
void setUp()
|
||||
{
|
||||
(void)path_SetRoot(0, ".");
|
||||
vfs_init();
|
||||
}
|
||||
|
||||
void tearDown()
|
||||
{
|
||||
vfs_shutdown();
|
||||
path_ResetRootDir();
|
||||
}
|
||||
|
||||
void test_create_archive_with_random_files()
|
||||
{
|
||||
if(!file_exists("archivetest")) // don't get stuck if this test fails and never deletes the directory it created
|
||||
TS_ASSERT_OK(dir_create("archivetest"));
|
||||
|
||||
TS_ASSERT_OK(vfs_mount("", "archivetest"));
|
||||
|
||||
generate_random_files();
|
||||
TS_ASSERT_OK(archive_build(archive_fn, filenames));
|
||||
|
||||
// wipe out file cache, otherwise we're just going to get back
|
||||
// the file contents read during archive_build .
|
||||
file_cache_reset();
|
||||
|
||||
// read in each file and compare file contents
|
||||
Handle ha = archive_open(archive_fn);
|
||||
TS_ASSERT(ha > 0);
|
||||
for(size_t i = 0; i < NUM_FILES; i++)
|
||||
{
|
||||
File f;
|
||||
TS_ASSERT_OK(afile_open(ha, filenames[i], 0, 0, &f));
|
||||
FileIOBuf buf = FILE_BUF_ALLOC;
|
||||
ssize_t bytes_read = afile_read(&f, 0, files[i].size, &buf);
|
||||
TS_ASSERT_EQUALS(bytes_read, files[i].size);
|
||||
|
||||
TS_ASSERT_SAME_DATA(buf, files[i].data, files[i].size);
|
||||
|
||||
TS_ASSERT_OK(file_cache_free(buf));
|
||||
TS_ASSERT_OK(afile_close(&f));
|
||||
SAFE_ARRAY_DELETE(files[i].data);
|
||||
}
|
||||
TS_ASSERT_OK(archive_close(ha));
|
||||
|
||||
dir_delete("archivetest");
|
||||
file_delete(archive_fn);
|
||||
}
|
||||
|
||||
void test_multiple_init_shutdown()
|
||||
{
|
||||
// setUp has already vfs_init-ed it and tearDown will vfs_shutdown.
|
||||
vfs_shutdown();
|
||||
vfs_init();
|
||||
}
|
||||
};
|
||||
@ -196,36 +196,6 @@ static void PumpEvents()
|
||||
}
|
||||
|
||||
|
||||
// return indication of whether archive is currently being built; this is
|
||||
// used to prevent reloading during that time (see call site).
|
||||
static bool ProgressiveBuildArchive()
|
||||
{
|
||||
ONCE(g_GUI->SendEventToAll("archivebuildercomplete"));
|
||||
return false;
|
||||
#if 0
|
||||
int ret = vfs_opt_auto_build("../logs/trace.txt", "mods/official/official%02d.zip", "mods/official/mini%02d.zip");
|
||||
if(ret == INFO::ALL_COMPLETE)
|
||||
{
|
||||
// nothing to do; will return false below
|
||||
}
|
||||
else if(ret < 0)
|
||||
DEBUG_DISPLAY_ERROR(L"Archive build failed");
|
||||
else if(ret == INFO::OK)
|
||||
g_GUI.SendEventToAll("archivebuildercomplete");
|
||||
// in progress
|
||||
else
|
||||
{
|
||||
int percent = (int)ret;
|
||||
g_ScriptingHost.SetGlobal("g_ArchiveBuilderProgress", INT_TO_JSVAL(percent));
|
||||
g_GUI.SendEventToAll("archivebuilderprogress");
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
static int ProgressiveLoad()
|
||||
{
|
||||
PROFILE3("progressive load");
|
||||
@ -334,15 +304,10 @@ static void Frame()
|
||||
// this is mostly relevant for "inactive" state, so that other windows
|
||||
// get enough CPU time, but it's always nice for power+thermal management.
|
||||
|
||||
bool is_building_archive = ProgressiveBuildArchive();
|
||||
|
||||
// this scans for changed files/directories and reloads them, thus
|
||||
// allowing hotloading (changes are immediately assimilated in-game).
|
||||
// must not be done during archive building because it changes the
|
||||
// archive file each iteration, but keeps it locked; reloading
|
||||
// would trigger a warning because the file can't be opened.
|
||||
if(!is_building_archive)
|
||||
ReloadChangedFiles();
|
||||
ReloadChangedFiles();
|
||||
|
||||
ProgressiveLoad();
|
||||
|
||||
|
||||
@ -143,14 +143,6 @@ static void ProcessCommandLineArgs(const CmdLineArgs& args)
|
||||
// TODO: all these options (and the ones processed elsewhere) should
|
||||
// be documented somewhere for users.
|
||||
|
||||
if (args.Has("buildarchive"))
|
||||
{
|
||||
// note: VFS init is sure to have been completed by now
|
||||
// (since CONFIG_Init reads from file); therefore,
|
||||
// it is safe to call this from here directly.
|
||||
// vfs_opt_rebuild_main_archive("mods/official/official1.zip", "../logs/trace.txt");
|
||||
}
|
||||
|
||||
// Handle "-conf=key:value" (potentially multiple times)
|
||||
std::vector<CStr> conf = args.GetMultiple("conf");
|
||||
for (size_t i = 0; i < conf.size(); ++i)
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
|
||||
#include "ps/CStr.h"
|
||||
#include "ps/Filesystem.h"
|
||||
//#include "lib/res/file/archive/vfs_optimizer.h" // ArchiveBuilderCancel
|
||||
#include "scripting/ScriptingHost.h"
|
||||
#include "scriptinterface/ScriptInterface.h"
|
||||
#include "ps/scripting/JSInterface_VFS.h"
|
||||
@ -266,17 +265,3 @@ JSBool JSI_VFS::ReadFileLines(JSContext* cx, uintN argc, jsval* vp)
|
||||
JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL( line_array ));
|
||||
return JS_TRUE ;
|
||||
}
|
||||
|
||||
|
||||
// vfs_optimizer
|
||||
|
||||
JSBool JSI_VFS::ArchiveBuilderCancel(JSContext* cx, uintN argc, jsval* vp)
|
||||
{
|
||||
UNUSED2(cx);
|
||||
UNUSED2(argc);
|
||||
|
||||
// vfs_opt_auto_build_cancel();
|
||||
|
||||
JS_SET_RVAL(cx, vp, JSVAL_VOID);
|
||||
return JS_TRUE;
|
||||
}
|
||||
|
||||
@ -69,11 +69,6 @@ namespace JSI_VFS
|
||||
// lines = readFileLines(filename);
|
||||
// filename: VFS filename (may include path)
|
||||
JSBool ReadFileLines(JSContext* cx, uintN argc, jsval* vp);
|
||||
|
||||
// Abort the current archive build operation (no-op if not currently active).
|
||||
//
|
||||
// archiveBuilderCancel();
|
||||
JSBool ArchiveBuilderCancel(JSContext* cx, uintN argc, jsval* vp);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -386,7 +386,6 @@ JSFunctionSpec ScriptFunctionTable[] =
|
||||
JS_FUNC("getFileSize", JSI_VFS::GetFileSize, 1)
|
||||
JS_FUNC("readFile", JSI_VFS::ReadFile, 1)
|
||||
JS_FUNC("readFileLines", JSI_VFS::ReadFileLines, 1)
|
||||
JS_FUNC("archiveBuilderCancel", JSI_VFS::ArchiveBuilderCancel, 1)
|
||||
|
||||
// Misc. Engine Interface
|
||||
JS_FUNC("exit", ExitProgram, 0)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user