janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
348 lines
8.5 KiB
C++
348 lines
8.5 KiB
C++
#include "precompiled.h"
|
|
|
|
#include "Pyrogenesis.h"
|
|
#include "Parser.h"
|
|
#include "ConfigDB.h"
|
|
#include "CLogger.h"
|
|
#include "Filesystem.h"
|
|
#include "scripting/ScriptingHost.h"
|
|
|
|
#define LOG_CATEGORY "config"
|
|
|
|
using namespace std;
|
|
|
|
typedef map <CStr, CConfigValueSet> TConfigMap;
|
|
TConfigMap CConfigDB::m_Map[CFG_LAST];
|
|
CStr CConfigDB::m_ConfigFile[CFG_LAST];
|
|
bool CConfigDB::m_UseVFS[CFG_LAST];
|
|
|
|
namespace ConfigNamespace_JS
|
|
{
|
|
JSBool GetProperty( JSContext* cx, JSObject* obj, jsval id, jsval* vp )
|
|
{
|
|
EConfigNamespace cfgNs=(EConfigNamespace)(intptr_t)JS_GetPrivate(cx, obj);
|
|
if (cfgNs < 0 || cfgNs >= CFG_LAST)
|
|
return JS_FALSE;
|
|
|
|
CStr propName = g_ScriptingHost.ValueToString(id);
|
|
CConfigValue *val=g_ConfigDB.GetValue(cfgNs, propName);
|
|
if (val)
|
|
{
|
|
JSString *js_str=JS_NewStringCopyN(cx, val->m_String.c_str(), val->m_String.size());
|
|
*vp = STRING_TO_JSVAL(js_str);
|
|
}
|
|
return JS_TRUE;
|
|
}
|
|
|
|
JSBool SetProperty( JSContext* cx, JSObject* obj, jsval id, jsval* vp )
|
|
{
|
|
EConfigNamespace cfgNs=(EConfigNamespace)(intptr_t)JS_GetPrivate(cx, obj);
|
|
if (cfgNs < 0 || cfgNs >= CFG_LAST)
|
|
return JS_FALSE;
|
|
|
|
CStr propName = g_ScriptingHost.ValueToString(id);
|
|
CConfigValue *val=g_ConfigDB.CreateValue(cfgNs, propName);
|
|
char *str;
|
|
if (JS_ConvertArguments(cx, 1, vp, "s", &str))
|
|
{
|
|
val->m_String=str;
|
|
return JS_TRUE;
|
|
}
|
|
else
|
|
return JS_FALSE;
|
|
}
|
|
|
|
JSClass Class = {
|
|
"ConfigNamespace", JSCLASS_HAS_PRIVATE,
|
|
JS_PropertyStub, JS_PropertyStub,
|
|
GetProperty, SetProperty,
|
|
JS_EnumerateStub, JS_ResolveStub,
|
|
JS_ConvertStub, JS_FinalizeStub
|
|
};
|
|
|
|
JSBool Construct( JSContext* cx, JSObject* obj, uintN argc, jsval* UNUSED(argv), jsval* rval )
|
|
{
|
|
if (argc != 0)
|
|
return JS_FALSE;
|
|
|
|
JSObject *newObj=JS_NewObject(cx, &Class, NULL, obj);
|
|
*rval=OBJECT_TO_JSVAL(newObj);
|
|
return JS_TRUE;
|
|
}
|
|
|
|
void SetNamespace(JSContext *cx, JSObject *obj, EConfigNamespace cfgNs)
|
|
{
|
|
JS_SetPrivate(cx, obj, (void *)cfgNs);
|
|
}
|
|
|
|
JSBool WriteFile( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval )
|
|
{
|
|
EConfigNamespace cfgNs=(EConfigNamespace)(intptr_t)JS_GetPrivate(cx, obj);
|
|
if (cfgNs < 0 || cfgNs >= CFG_LAST)
|
|
return JS_FALSE;
|
|
|
|
if (argc != 2)
|
|
return JS_FALSE;
|
|
|
|
JSBool useVFS;
|
|
char *path;
|
|
if (JS_ConvertArguments(cx, 2, argv, "bs", &useVFS, &path))
|
|
{
|
|
JSBool res=g_ConfigDB.WriteFile(cfgNs, useVFS?true:false, path);
|
|
*rval = BOOLEAN_TO_JSVAL(res);
|
|
return JS_TRUE;
|
|
}
|
|
else
|
|
return JS_FALSE;
|
|
}
|
|
|
|
JSBool Reload( JSContext* cx, JSObject* obj, uintN argc, jsval* UNUSED(argv), jsval* rval )
|
|
{
|
|
if (argc != 0)
|
|
return JS_FALSE;
|
|
|
|
EConfigNamespace cfgNs=(EConfigNamespace)(intptr_t)JS_GetPrivate(cx, obj);
|
|
if (cfgNs < 0 || cfgNs >= CFG_LAST)
|
|
return JS_FALSE;
|
|
|
|
JSBool ret=g_ConfigDB.Reload(cfgNs);
|
|
*rval = BOOLEAN_TO_JSVAL(ret);
|
|
return JS_TRUE;
|
|
}
|
|
|
|
JSBool SetFile( JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* UNUSED(rval) )
|
|
{
|
|
if (argc != 0)
|
|
return JS_FALSE;
|
|
|
|
EConfigNamespace cfgNs=(EConfigNamespace)(intptr_t)JS_GetPrivate(cx, obj);
|
|
if (cfgNs < 0 || cfgNs >= CFG_LAST)
|
|
return JS_FALSE;
|
|
|
|
JSBool useVFS;
|
|
char *path;
|
|
if (JS_ConvertArguments(cx, 2, argv, "bs", &useVFS, &path))
|
|
{
|
|
g_ConfigDB.SetConfigFile(cfgNs, useVFS?true:false, path);
|
|
return JS_TRUE;
|
|
}
|
|
else
|
|
return JS_FALSE;
|
|
}
|
|
|
|
JSFunctionSpec Funcs[] = {
|
|
{ "writeFile", WriteFile, 2, 0, 0},
|
|
{ "reload", Reload, 0, 0, 0},
|
|
{ "setFile", SetFile, 2, 0, 0},
|
|
{0}
|
|
};
|
|
};
|
|
|
|
namespace ConfigDB_JS
|
|
{
|
|
JSClass Class = {
|
|
"ConfigDB", 0,
|
|
JS_PropertyStub, JS_PropertyStub,
|
|
JS_PropertyStub, JS_PropertyStub,
|
|
JS_EnumerateStub, JS_ResolveStub,
|
|
JS_ConvertStub, JS_FinalizeStub
|
|
};
|
|
|
|
JSPropertySpec Props[] = {
|
|
{0}
|
|
};
|
|
|
|
JSFunctionSpec Funcs[] = {
|
|
{0}
|
|
};
|
|
|
|
JSBool Construct( JSContext* cx, JSObject* obj, uintN argc, jsval* UNUSED(argv), jsval* rval )
|
|
{
|
|
if (argc != 0)
|
|
return JS_FALSE;
|
|
|
|
JSObject *newObj=JS_NewObject(cx, &Class, NULL, obj);
|
|
*rval=OBJECT_TO_JSVAL(newObj);
|
|
|
|
int flags=JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT;
|
|
#define cfg_ns(_propname, _enum) STMT (\
|
|
JSObject *nsobj=g_ScriptingHost.CreateCustomObject("ConfigNamespace"); \
|
|
debug_assert(nsobj); \
|
|
ConfigNamespace_JS::SetNamespace(cx, nsobj, _enum); \
|
|
debug_assert(JS_DefineProperty(cx, newObj, _propname, OBJECT_TO_JSVAL(nsobj), NULL, NULL, flags)); )
|
|
|
|
cfg_ns("system", CFG_SYSTEM);
|
|
cfg_ns("user", CFG_USER);
|
|
cfg_ns("mod", CFG_MOD);
|
|
|
|
#undef cfg_ns
|
|
|
|
return JS_TRUE;
|
|
}
|
|
|
|
};
|
|
|
|
CConfigDB::CConfigDB()
|
|
{
|
|
g_ScriptingHost.DefineCustomObjectType(&ConfigDB_JS::Class, ConfigDB_JS::Construct, 0, ConfigDB_JS::Props, ConfigDB_JS::Funcs, NULL, NULL);
|
|
g_ScriptingHost.DefineCustomObjectType(&ConfigNamespace_JS::Class, ConfigNamespace_JS::Construct, 0, NULL, ConfigNamespace_JS::Funcs, NULL, NULL);
|
|
JSObject *js_ConfigDB=g_ScriptingHost.CreateCustomObject("ConfigDB");
|
|
g_ScriptingHost.SetGlobal("g_ConfigDB", OBJECT_TO_JSVAL(js_ConfigDB));
|
|
}
|
|
|
|
CConfigValue *CConfigDB::GetValue(EConfigNamespace ns, const CStr& name)
|
|
{
|
|
CConfigValueSet* values = GetValues( ns, name );
|
|
if( !values ) return( NULL );
|
|
return &( (*values)[0] );
|
|
}
|
|
|
|
CConfigValueSet *CConfigDB::GetValues(EConfigNamespace ns, const CStr& name )
|
|
{
|
|
if (ns < 0 || ns >= CFG_LAST)
|
|
{
|
|
debug_warn("CConfigDB: Invalid ns value");
|
|
return NULL;
|
|
}
|
|
|
|
TConfigMap::iterator it = m_Map[CFG_COMMAND].find( name );
|
|
if( it != m_Map[CFG_COMMAND].end() )
|
|
return &( it->second );
|
|
|
|
for( int search_ns = ns; search_ns >= CFG_SYSTEM; search_ns-- )
|
|
{
|
|
TConfigMap::iterator it = m_Map[search_ns].find(name);
|
|
if (it != m_Map[search_ns].end())
|
|
return &( it->second );
|
|
}
|
|
|
|
return( NULL );
|
|
}
|
|
|
|
CConfigValue *CConfigDB::CreateValue(EConfigNamespace ns, const CStr& name)
|
|
{
|
|
if (ns < 0 || ns >= CFG_LAST)
|
|
{
|
|
debug_warn("CConfigDB: Invalid ns value");
|
|
return NULL;
|
|
}
|
|
|
|
CConfigValue *ret=GetValue(ns, name);
|
|
if (ret) return ret;
|
|
|
|
TConfigMap::iterator it=m_Map[ns].insert(m_Map[ns].begin(), make_pair(name, CConfigValueSet( 1 )));
|
|
return &(it->second[0]);
|
|
}
|
|
|
|
void CConfigDB::SetConfigFile(EConfigNamespace ns, bool useVFS, const CStr& path)
|
|
{
|
|
if (ns < 0 || ns >= CFG_LAST)
|
|
{
|
|
debug_warn("CConfigDB: Invalid ns value");
|
|
return;
|
|
}
|
|
|
|
m_ConfigFile[ns]=path;
|
|
m_UseVFS[ns]=useVFS;
|
|
}
|
|
|
|
bool CConfigDB::Reload(EConfigNamespace ns)
|
|
{
|
|
// Set up CParser
|
|
CParser parser;
|
|
CParserLine parserLine;
|
|
parser.InputTaskType("Assignment", "_$ident_=<_[-$arg(_minus)]_$value_,>_[-$arg(_minus)]_$value[[;]$rest]");
|
|
parser.InputTaskType("CommentOrBlank", "_[;[$rest]]");
|
|
|
|
// Open file with VFS
|
|
shared_ptr<u8> buffer; size_t buflen;
|
|
{
|
|
LibError ret = g_VFS->LoadFile(m_ConfigFile[ns], buffer, buflen);
|
|
if(ret != INFO::OK)
|
|
{
|
|
LOG(CLogger::Error, LOG_CATEGORY, "vfs_load for \"%s\" failed: return was %lld", m_ConfigFile[ns].c_str(), ret);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
TConfigMap newMap;
|
|
|
|
char *filebuf=(char *)buffer.get();
|
|
char *filebufend=filebuf+buflen;
|
|
|
|
// Read file line by line
|
|
char *next=filebuf-1;
|
|
do
|
|
{
|
|
char *pos=next+1;
|
|
next=(char *)memchr(pos, '\n', filebufend-pos);
|
|
if (!next) next=filebufend;
|
|
|
|
char *lend=next;
|
|
if (*(lend-1) == '\r') lend--;
|
|
|
|
// Send line to parser
|
|
bool parseOk=parserLine.ParseString(parser, std::string(pos, lend));
|
|
// Get name and value from parser
|
|
string name;
|
|
string value;
|
|
|
|
if (parseOk &&
|
|
parserLine.GetArgCount()>=2 &&
|
|
parserLine.GetArgString(0, name) &&
|
|
parserLine.GetArgString(1, value))
|
|
{
|
|
// Add name and value to the map
|
|
size_t argCount = parserLine.GetArgCount();
|
|
|
|
newMap[name].clear();
|
|
|
|
for( size_t t = 0; t < argCount; t++ )
|
|
{
|
|
if( !parserLine.GetArgString( (int)t + 1, value ) )
|
|
continue;
|
|
CConfigValue argument;
|
|
argument.m_String = value;
|
|
newMap[name].push_back( argument );
|
|
LOG(CLogger::Normal, LOG_CATEGORY, "Loaded config string \"%s\" = \"%s\"", name.c_str(), value.c_str());
|
|
}
|
|
}
|
|
}
|
|
while (next < filebufend);
|
|
|
|
m_Map[ns].swap(newMap);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool CConfigDB::WriteFile(EConfigNamespace ns, bool useVFS, const CStr& path)
|
|
{
|
|
debug_assert(useVFS);
|
|
|
|
if (ns < 0 || ns >= CFG_LAST)
|
|
{
|
|
debug_warn("CConfigDB: Invalid ns value");
|
|
return false;
|
|
}
|
|
|
|
const char *filepath=path.c_str();
|
|
|
|
shared_ptr<u8> buf = io_Allocate(1*MiB);
|
|
char* pos = (char*)buf.get();
|
|
TConfigMap &map=m_Map[ns];
|
|
for(TConfigMap::const_iterator it = it=map.begin(); it != map.end(); ++it)
|
|
{
|
|
pos += sprintf(pos, "%s = \"%s\"\n", it->first.c_str(), it->second[0].m_String.c_str());
|
|
}
|
|
const size_t len = pos - (char*)buf.get();
|
|
|
|
LibError ret = g_VFS->CreateFile(filepath, buf, len);
|
|
if(ret < 0)
|
|
{
|
|
LOG(CLogger::Error, LOG_CATEGORY, "CConfigDB::WriteFile(): CreateFile \"%s\" failed (error: %d)", filepath, (int)ret);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|