2025-02-05 12:40:54 +10:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2018-09-08 18:08:48 +08:00
|
|
|
/* ***** BEGIN LICENSE BLOCK *****
|
|
|
|
|
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
|
|
|
*
|
|
|
|
|
* The contents of this file are subject to the Mozilla Public License Version
|
|
|
|
|
* 1.1 (the "License"); you may not use this file except in compliance with
|
|
|
|
|
* the License. You may obtain a copy of the License at
|
|
|
|
|
* http://www.mozilla.org/MPL/
|
|
|
|
|
*
|
|
|
|
|
* Software distributed under the License is distributed on an "AS IS" basis,
|
|
|
|
|
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
|
|
|
* for the specific language governing rights and limitations under the
|
|
|
|
|
* License.
|
|
|
|
|
*
|
|
|
|
|
* The Original Code is Mozilla JavaScript code.
|
|
|
|
|
*
|
|
|
|
|
* The Initial Developer of the Original Code is
|
|
|
|
|
* Netscape Communications Corporation.
|
|
|
|
|
* Portions created by the Initial Developer are Copyright (C) 1999-2001
|
|
|
|
|
* the Initial Developer. All Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Contributor(s):
|
|
|
|
|
* Brendan Eich <brendan@mozilla.org> (Original Author)
|
|
|
|
|
* Chris Waterson <waterson@netscape.com>
|
2023-07-12 13:27:26 +10:00
|
|
|
* L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
|
2018-09-08 18:08:48 +08:00
|
|
|
*
|
|
|
|
|
* Alternatively, the contents of this file may be used under the terms of
|
|
|
|
|
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
|
|
|
|
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
|
|
|
* in which case the provisions of the GPL or the LGPL are applicable instead
|
|
|
|
|
* of those above. If you wish to allow use of your version of this file only
|
|
|
|
|
* under the terms of either the GPL or the LGPL, and not to allow others to
|
|
|
|
|
* use your version of this file under the terms of the MPL, indicate your
|
|
|
|
|
* decision by deleting the provisions above and replace them with the notice
|
|
|
|
|
* and other provisions required by the GPL or the LGPL. If you do not delete
|
|
|
|
|
* the provisions above, a recipient may use your version of this file under
|
|
|
|
|
* the terms of any one of the MPL, the GPL or the LGPL.
|
|
|
|
|
*
|
|
|
|
|
* ***** END LICENSE BLOCK ***** */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Double hashing implementation.
|
|
|
|
|
*/
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
2025-02-05 12:40:54 +10:00
|
|
|
#include "jsstdint.h"
|
2018-09-08 18:08:48 +08:00
|
|
|
#include "jsbit.h"
|
|
|
|
|
#include "jsdhash.h"
|
|
|
|
|
#include "jsutil.h" /* for JS_ASSERT */
|
|
|
|
|
|
|
|
|
|
#ifdef JS_DHASHMETER
|
|
|
|
|
# if defined MOZILLA_CLIENT && defined DEBUG_XXXbrendan
|
|
|
|
|
# include "nsTraceMalloc.h"
|
|
|
|
|
# endif
|
|
|
|
|
# define METER(x) x
|
|
|
|
|
#else
|
|
|
|
|
# define METER(x) /* nothing */
|
|
|
|
|
#endif
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
/*
|
|
|
|
|
* The following DEBUG-only code is used to assert that calls to one of
|
|
|
|
|
* table->ops or to an enumerator do not cause re-entry into a call that
|
|
|
|
|
* can mutate the table. The recursion level is stored in additional
|
|
|
|
|
* space allocated at the end of the entry store to avoid changing
|
|
|
|
|
* JSDHashTable, which could cause issues when mixing DEBUG and
|
|
|
|
|
* non-DEBUG components.
|
|
|
|
|
*/
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
|
2025-02-03 12:35:24 +10:00
|
|
|
#define JSDHASH_ONELINE_ASSERT JS_ASSERT
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
#define RECURSION_LEVEL(table_) (*(uint32*)(table_->entryStore + \
|
|
|
|
|
JS_DHASH_TABLE_SIZE(table_) * \
|
|
|
|
|
table_->entrySize))
|
2025-02-05 12:40:54 +10:00
|
|
|
/*
|
|
|
|
|
* Most callers that assert about the recursion level don't care about
|
|
|
|
|
* this magical value because they are asserting that mutation is
|
|
|
|
|
* allowed (and therefore the level is 0 or 1, depending on whether they
|
|
|
|
|
* incremented it).
|
|
|
|
|
*
|
|
|
|
|
* Only PL_DHashTableFinish needs to allow this special value.
|
|
|
|
|
*/
|
|
|
|
|
#define IMMUTABLE_RECURSION_LEVEL ((uint32)-1)
|
|
|
|
|
|
|
|
|
|
#define RECURSION_LEVEL_SAFE_TO_FINISH(table_) \
|
|
|
|
|
(RECURSION_LEVEL(table_) == 0 || \
|
|
|
|
|
RECURSION_LEVEL(table_) == IMMUTABLE_RECURSION_LEVEL)
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
|
|
|
|
#define ENTRY_STORE_EXTRA sizeof(uint32)
|
2025-02-05 12:40:54 +10:00
|
|
|
#define INCREMENT_RECURSION_LEVEL(table_) \
|
|
|
|
|
JS_BEGIN_MACRO \
|
|
|
|
|
if (RECURSION_LEVEL(table_) != IMMUTABLE_RECURSION_LEVEL) \
|
|
|
|
|
++RECURSION_LEVEL(table_); \
|
2025-02-03 12:35:24 +10:00
|
|
|
JS_END_MACRO
|
2025-02-05 12:40:54 +10:00
|
|
|
#define DECREMENT_RECURSION_LEVEL(table_) \
|
|
|
|
|
JS_BEGIN_MACRO \
|
|
|
|
|
if (RECURSION_LEVEL(table_) != IMMUTABLE_RECURSION_LEVEL) { \
|
|
|
|
|
JSDHASH_ONELINE_ASSERT(RECURSION_LEVEL(table_) > 0); \
|
|
|
|
|
--RECURSION_LEVEL(table_); \
|
|
|
|
|
} \
|
2025-02-03 12:35:24 +10:00
|
|
|
JS_END_MACRO
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
#define ENTRY_STORE_EXTRA 0
|
2025-02-03 12:35:24 +10:00
|
|
|
#define INCREMENT_RECURSION_LEVEL(table_) JS_BEGIN_MACRO JS_END_MACRO
|
|
|
|
|
#define DECREMENT_RECURSION_LEVEL(table_) JS_BEGIN_MACRO JS_END_MACRO
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
|
|
|
|
#endif /* defined(DEBUG) */
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
JS_PUBLIC_API(void *)
|
|
|
|
|
JS_DHashAllocTable(JSDHashTable *table, uint32 nbytes)
|
|
|
|
|
{
|
2025-02-05 12:40:54 +10:00
|
|
|
return js_malloc(nbytes);
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashFreeTable(JSDHashTable *table, void *ptr)
|
|
|
|
|
{
|
2025-02-05 12:40:54 +10:00
|
|
|
js_free(ptr);
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSDHashNumber)
|
|
|
|
|
JS_DHashStringKey(JSDHashTable *table, const void *key)
|
|
|
|
|
{
|
|
|
|
|
JSDHashNumber h;
|
|
|
|
|
const unsigned char *s;
|
|
|
|
|
|
|
|
|
|
h = 0;
|
2023-07-12 13:27:26 +10:00
|
|
|
for (s = (const unsigned char *) key; *s != '\0'; s++)
|
|
|
|
|
h = JS_ROTATE_LEFT32(h, 4) ^ *s;
|
2018-09-08 18:08:48 +08:00
|
|
|
return h;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSDHashNumber)
|
|
|
|
|
JS_DHashVoidPtrKeyStub(JSDHashTable *table, const void *key)
|
|
|
|
|
{
|
2025-03-19 21:25:58 +10:00
|
|
|
return (JSDHashNumber)(uintptr_t)key >> 2;
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSBool)
|
|
|
|
|
JS_DHashMatchEntryStub(JSDHashTable *table,
|
|
|
|
|
const JSDHashEntryHdr *entry,
|
|
|
|
|
const void *key)
|
|
|
|
|
{
|
|
|
|
|
const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
|
|
|
|
|
|
|
|
|
|
return stub->key == key;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSBool)
|
|
|
|
|
JS_DHashMatchStringKey(JSDHashTable *table,
|
|
|
|
|
const JSDHashEntryHdr *entry,
|
|
|
|
|
const void *key)
|
|
|
|
|
{
|
|
|
|
|
const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
|
|
|
|
|
|
|
|
|
|
/* XXX tolerate null keys on account of sloppy Mozilla callers. */
|
|
|
|
|
return stub->key == key ||
|
2023-07-12 13:27:26 +10:00
|
|
|
(stub->key && key &&
|
|
|
|
|
strcmp((const char *) stub->key, (const char *) key) == 0);
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashMoveEntryStub(JSDHashTable *table,
|
|
|
|
|
const JSDHashEntryHdr *from,
|
|
|
|
|
JSDHashEntryHdr *to)
|
|
|
|
|
{
|
|
|
|
|
memcpy(to, from, table->entrySize);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashClearEntryStub(JSDHashTable *table, JSDHashEntryHdr *entry)
|
|
|
|
|
{
|
|
|
|
|
memset(entry, 0, table->entrySize);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashFreeStringKey(JSDHashTable *table, JSDHashEntryHdr *entry)
|
|
|
|
|
{
|
|
|
|
|
const JSDHashEntryStub *stub = (const JSDHashEntryStub *)entry;
|
|
|
|
|
|
2025-02-05 12:40:54 +10:00
|
|
|
js_free((void *) stub->key);
|
2018-09-08 18:08:48 +08:00
|
|
|
memset(entry, 0, table->entrySize);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashFinalizeStub(JSDHashTable *table)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const JSDHashTableOps stub_ops = {
|
|
|
|
|
JS_DHashAllocTable,
|
|
|
|
|
JS_DHashFreeTable,
|
|
|
|
|
JS_DHashVoidPtrKeyStub,
|
|
|
|
|
JS_DHashMatchEntryStub,
|
|
|
|
|
JS_DHashMoveEntryStub,
|
|
|
|
|
JS_DHashClearEntryStub,
|
|
|
|
|
JS_DHashFinalizeStub,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(const JSDHashTableOps *)
|
|
|
|
|
JS_DHashGetStubOps(void)
|
|
|
|
|
{
|
|
|
|
|
return &stub_ops;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSDHashTable *)
|
|
|
|
|
JS_NewDHashTable(const JSDHashTableOps *ops, void *data, uint32 entrySize,
|
|
|
|
|
uint32 capacity)
|
|
|
|
|
{
|
|
|
|
|
JSDHashTable *table;
|
|
|
|
|
|
2025-02-05 12:40:54 +10:00
|
|
|
table = (JSDHashTable *) js_malloc(sizeof *table);
|
2018-09-08 18:08:48 +08:00
|
|
|
if (!table)
|
|
|
|
|
return NULL;
|
|
|
|
|
if (!JS_DHashTableInit(table, ops, data, entrySize, capacity)) {
|
2025-02-05 12:40:54 +10:00
|
|
|
js_free(table);
|
2018-09-08 18:08:48 +08:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return table;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashTableDestroy(JSDHashTable *table)
|
|
|
|
|
{
|
|
|
|
|
JS_DHashTableFinish(table);
|
2025-02-05 12:40:54 +10:00
|
|
|
js_free(table);
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSBool)
|
|
|
|
|
JS_DHashTableInit(JSDHashTable *table, const JSDHashTableOps *ops, void *data,
|
|
|
|
|
uint32 entrySize, uint32 capacity)
|
|
|
|
|
{
|
|
|
|
|
int log2;
|
|
|
|
|
uint32 nbytes;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
if (entrySize > 10 * sizeof(void *)) {
|
|
|
|
|
fprintf(stderr,
|
|
|
|
|
"jsdhash: for the table at address %p, the given entrySize"
|
|
|
|
|
" of %lu %s favors chaining over double hashing.\n",
|
2023-07-12 13:27:26 +10:00
|
|
|
(void *) table,
|
2018-09-08 18:08:48 +08:00
|
|
|
(unsigned long) entrySize,
|
|
|
|
|
(entrySize > 16 * sizeof(void*)) ? "definitely" : "probably");
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
table->ops = ops;
|
|
|
|
|
table->data = data;
|
|
|
|
|
if (capacity < JS_DHASH_MIN_SIZE)
|
|
|
|
|
capacity = JS_DHASH_MIN_SIZE;
|
|
|
|
|
|
|
|
|
|
JS_CEILING_LOG2(log2, capacity);
|
|
|
|
|
|
|
|
|
|
capacity = JS_BIT(log2);
|
|
|
|
|
if (capacity >= JS_DHASH_SIZE_LIMIT)
|
|
|
|
|
return JS_FALSE;
|
|
|
|
|
table->hashShift = JS_DHASH_BITS - log2;
|
2023-07-12 13:27:26 +10:00
|
|
|
table->maxAlphaFrac = (uint8)(0x100 * JS_DHASH_DEFAULT_MAX_ALPHA);
|
|
|
|
|
table->minAlphaFrac = (uint8)(0x100 * JS_DHASH_DEFAULT_MIN_ALPHA);
|
2018-09-08 18:08:48 +08:00
|
|
|
table->entrySize = entrySize;
|
|
|
|
|
table->entryCount = table->removedCount = 0;
|
|
|
|
|
table->generation = 0;
|
|
|
|
|
nbytes = capacity * entrySize;
|
|
|
|
|
|
2023-07-12 13:27:26 +10:00
|
|
|
table->entryStore = (char *) ops->allocTable(table,
|
|
|
|
|
nbytes + ENTRY_STORE_EXTRA);
|
2018-09-08 18:08:48 +08:00
|
|
|
if (!table->entryStore)
|
|
|
|
|
return JS_FALSE;
|
|
|
|
|
memset(table->entryStore, 0, nbytes);
|
|
|
|
|
METER(memset(&table->stats, 0, sizeof table->stats));
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
RECURSION_LEVEL(table) = 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
return JS_TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Compute max and min load numbers (entry counts) from table params.
|
|
|
|
|
*/
|
|
|
|
|
#define MAX_LOAD(table, size) (((table)->maxAlphaFrac * (size)) >> 8)
|
|
|
|
|
#define MIN_LOAD(table, size) (((table)->minAlphaFrac * (size)) >> 8)
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashTableSetAlphaBounds(JSDHashTable *table,
|
|
|
|
|
float maxAlpha,
|
|
|
|
|
float minAlpha)
|
|
|
|
|
{
|
|
|
|
|
uint32 size;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Reject obviously insane bounds, rather than trying to guess what the
|
|
|
|
|
* buggy caller intended.
|
|
|
|
|
*/
|
|
|
|
|
JS_ASSERT(0.5 <= maxAlpha && maxAlpha < 1 && 0 <= minAlpha);
|
|
|
|
|
if (maxAlpha < 0.5 || 1 <= maxAlpha || minAlpha < 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Ensure that at least one entry will always be free. If maxAlpha at
|
|
|
|
|
* minimum size leaves no entries free, reduce maxAlpha based on minimum
|
|
|
|
|
* size and the precision limit of maxAlphaFrac's fixed point format.
|
|
|
|
|
*/
|
|
|
|
|
JS_ASSERT(JS_DHASH_MIN_SIZE - (maxAlpha * JS_DHASH_MIN_SIZE) >= 1);
|
|
|
|
|
if (JS_DHASH_MIN_SIZE - (maxAlpha * JS_DHASH_MIN_SIZE) < 1) {
|
|
|
|
|
maxAlpha = (float)
|
|
|
|
|
(JS_DHASH_MIN_SIZE - JS_MAX(JS_DHASH_MIN_SIZE / 256, 1))
|
|
|
|
|
/ JS_DHASH_MIN_SIZE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Ensure that minAlpha is strictly less than half maxAlpha. Take care
|
|
|
|
|
* not to truncate an entry's worth of alpha when storing in minAlphaFrac
|
|
|
|
|
* (8-bit fixed point format).
|
|
|
|
|
*/
|
|
|
|
|
JS_ASSERT(minAlpha < maxAlpha / 2);
|
|
|
|
|
if (minAlpha >= maxAlpha / 2) {
|
|
|
|
|
size = JS_DHASH_TABLE_SIZE(table);
|
|
|
|
|
minAlpha = (size * maxAlpha - JS_MAX(size / 256, 1)) / (2 * size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table->maxAlphaFrac = (uint8)(maxAlpha * 256);
|
|
|
|
|
table->minAlphaFrac = (uint8)(minAlpha * 256);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Double hashing needs the second hash code to be relatively prime to table
|
|
|
|
|
* size, so we simply make hash2 odd.
|
|
|
|
|
*/
|
|
|
|
|
#define HASH1(hash0, shift) ((hash0) >> (shift))
|
|
|
|
|
#define HASH2(hash0,log2,shift) ((((hash0) << (log2)) >> (shift)) | 1)
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Reserve keyHash 0 for free entries and 1 for removed-entry sentinels. Note
|
|
|
|
|
* that a removed-entry sentinel need be stored only if the removed entry had
|
|
|
|
|
* a colliding entry added after it. Therefore we can use 1 as the collision
|
|
|
|
|
* flag in addition to the removed-entry sentinel value. Multiplicative hash
|
|
|
|
|
* uses the high order bits of keyHash, so this least-significant reservation
|
|
|
|
|
* should not hurt the hash function's effectiveness much.
|
|
|
|
|
*
|
|
|
|
|
* If you change any of these magic numbers, also update JS_DHASH_ENTRY_IS_LIVE
|
|
|
|
|
* in jsdhash.h. It used to be private to jsdhash.c, but then became public to
|
|
|
|
|
* assist iterator writers who inspect table->entryStore directly.
|
|
|
|
|
*/
|
|
|
|
|
#define COLLISION_FLAG ((JSDHashNumber) 1)
|
|
|
|
|
#define MARK_ENTRY_FREE(entry) ((entry)->keyHash = 0)
|
|
|
|
|
#define MARK_ENTRY_REMOVED(entry) ((entry)->keyHash = 1)
|
|
|
|
|
#define ENTRY_IS_REMOVED(entry) ((entry)->keyHash == 1)
|
|
|
|
|
#define ENTRY_IS_LIVE(entry) JS_DHASH_ENTRY_IS_LIVE(entry)
|
|
|
|
|
#define ENSURE_LIVE_KEYHASH(hash0) if (hash0 < 2) hash0 -= 2; else (void)0
|
|
|
|
|
|
|
|
|
|
/* Match an entry's keyHash against an unstored one computed from a key. */
|
|
|
|
|
#define MATCH_ENTRY_KEYHASH(entry,hash0) \
|
|
|
|
|
(((entry)->keyHash & ~COLLISION_FLAG) == (hash0))
|
|
|
|
|
|
|
|
|
|
/* Compute the address of the indexed entry in table. */
|
|
|
|
|
#define ADDRESS_ENTRY(table, index) \
|
|
|
|
|
((JSDHashEntryHdr *)((table)->entryStore + (index) * (table)->entrySize))
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashTableFinish(JSDHashTable *table)
|
|
|
|
|
{
|
|
|
|
|
char *entryAddr, *entryLimit;
|
|
|
|
|
uint32 entrySize;
|
|
|
|
|
JSDHashEntryHdr *entry;
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_XXXbrendan
|
|
|
|
|
static FILE *dumpfp = NULL;
|
|
|
|
|
if (!dumpfp) dumpfp = fopen("/tmp/jsdhash.bigdump", "w");
|
|
|
|
|
if (dumpfp) {
|
|
|
|
|
#ifdef MOZILLA_CLIENT
|
|
|
|
|
NS_TraceStack(1, dumpfp);
|
|
|
|
|
#endif
|
|
|
|
|
JS_DHashTableDumpMeter(table, NULL, dumpfp);
|
|
|
|
|
fputc('\n', dumpfp);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
INCREMENT_RECURSION_LEVEL(table);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
/* Call finalize before clearing entries, so it can enumerate them. */
|
|
|
|
|
table->ops->finalize(table);
|
|
|
|
|
|
|
|
|
|
/* Clear any remaining live entries. */
|
|
|
|
|
entryAddr = table->entryStore;
|
|
|
|
|
entrySize = table->entrySize;
|
|
|
|
|
entryLimit = entryAddr + JS_DHASH_TABLE_SIZE(table) * entrySize;
|
|
|
|
|
while (entryAddr < entryLimit) {
|
|
|
|
|
entry = (JSDHashEntryHdr *)entryAddr;
|
|
|
|
|
if (ENTRY_IS_LIVE(entry)) {
|
|
|
|
|
METER(table->stats.removeEnums++);
|
|
|
|
|
table->ops->clearEntry(table, entry);
|
|
|
|
|
}
|
|
|
|
|
entryAddr += entrySize;
|
|
|
|
|
}
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
DECREMENT_RECURSION_LEVEL(table);
|
2025-02-05 12:40:54 +10:00
|
|
|
JS_ASSERT(RECURSION_LEVEL_SAFE_TO_FINISH(table));
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
/* Free entry storage last. */
|
|
|
|
|
table->ops->freeTable(table, table->entryStore);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static JSDHashEntryHdr * JS_DHASH_FASTCALL
|
|
|
|
|
SearchTable(JSDHashTable *table, const void *key, JSDHashNumber keyHash,
|
|
|
|
|
JSDHashOperator op)
|
|
|
|
|
{
|
|
|
|
|
JSDHashNumber hash1, hash2;
|
|
|
|
|
int hashShift, sizeLog2;
|
|
|
|
|
JSDHashEntryHdr *entry, *firstRemoved;
|
|
|
|
|
JSDHashMatchEntry matchEntry;
|
|
|
|
|
uint32 sizeMask;
|
|
|
|
|
|
|
|
|
|
METER(table->stats.searches++);
|
|
|
|
|
JS_ASSERT(!(keyHash & COLLISION_FLAG));
|
|
|
|
|
|
|
|
|
|
/* Compute the primary hash address. */
|
|
|
|
|
hashShift = table->hashShift;
|
|
|
|
|
hash1 = HASH1(keyHash, hashShift);
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
|
|
|
|
|
/* Miss: return space for a new entry. */
|
|
|
|
|
if (JS_DHASH_ENTRY_IS_FREE(entry)) {
|
|
|
|
|
METER(table->stats.misses++);
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Hit: return entry. */
|
|
|
|
|
matchEntry = table->ops->matchEntry;
|
|
|
|
|
if (MATCH_ENTRY_KEYHASH(entry, keyHash) && matchEntry(table, entry, key)) {
|
|
|
|
|
METER(table->stats.hits++);
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Collision: double hash. */
|
|
|
|
|
sizeLog2 = JS_DHASH_BITS - table->hashShift;
|
|
|
|
|
hash2 = HASH2(keyHash, sizeLog2, hashShift);
|
|
|
|
|
sizeMask = JS_BITMASK(sizeLog2);
|
|
|
|
|
|
|
|
|
|
/* Save the first removed entry pointer so JS_DHASH_ADD can recycle it. */
|
2023-07-12 13:27:26 +10:00
|
|
|
firstRemoved = NULL;
|
2018-09-08 18:08:48 +08:00
|
|
|
|
|
|
|
|
for (;;) {
|
2023-07-12 13:27:26 +10:00
|
|
|
if (JS_UNLIKELY(ENTRY_IS_REMOVED(entry))) {
|
|
|
|
|
if (!firstRemoved)
|
|
|
|
|
firstRemoved = entry;
|
|
|
|
|
} else {
|
|
|
|
|
if (op == JS_DHASH_ADD)
|
|
|
|
|
entry->keyHash |= COLLISION_FLAG;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
METER(table->stats.steps++);
|
|
|
|
|
hash1 -= hash2;
|
|
|
|
|
hash1 &= sizeMask;
|
|
|
|
|
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
if (JS_DHASH_ENTRY_IS_FREE(entry)) {
|
|
|
|
|
METER(table->stats.misses++);
|
|
|
|
|
return (firstRemoved && op == JS_DHASH_ADD) ? firstRemoved : entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (MATCH_ENTRY_KEYHASH(entry, keyHash) &&
|
|
|
|
|
matchEntry(table, entry, key)) {
|
|
|
|
|
METER(table->stats.hits++);
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
2023-07-12 13:27:26 +10:00
|
|
|
}
|
2018-09-08 18:08:48 +08:00
|
|
|
|
2023-07-12 13:27:26 +10:00
|
|
|
/* NOTREACHED */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This is a copy of SearchTable, used by ChangeTable, hardcoded to
|
|
|
|
|
* 1. assume |op == PL_DHASH_ADD|,
|
|
|
|
|
* 2. assume that |key| will never match an existing entry, and
|
|
|
|
|
* 3. assume that no entries have been removed from the current table
|
|
|
|
|
* structure.
|
|
|
|
|
* Avoiding the need for |key| means we can avoid needing a way to map
|
|
|
|
|
* entries to keys, which means callers can use complex key types more
|
|
|
|
|
* easily.
|
|
|
|
|
*/
|
|
|
|
|
static JSDHashEntryHdr * JS_DHASH_FASTCALL
|
|
|
|
|
FindFreeEntry(JSDHashTable *table, JSDHashNumber keyHash)
|
|
|
|
|
{
|
|
|
|
|
JSDHashNumber hash1, hash2;
|
|
|
|
|
int hashShift, sizeLog2;
|
|
|
|
|
JSDHashEntryHdr *entry;
|
|
|
|
|
uint32 sizeMask;
|
|
|
|
|
|
|
|
|
|
METER(table->stats.searches++);
|
|
|
|
|
JS_ASSERT(!(keyHash & COLLISION_FLAG));
|
|
|
|
|
|
|
|
|
|
/* Compute the primary hash address. */
|
|
|
|
|
hashShift = table->hashShift;
|
|
|
|
|
hash1 = HASH1(keyHash, hashShift);
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
|
|
|
|
|
/* Miss: return space for a new entry. */
|
|
|
|
|
if (JS_DHASH_ENTRY_IS_FREE(entry)) {
|
|
|
|
|
METER(table->stats.misses++);
|
|
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Collision: double hash. */
|
|
|
|
|
sizeLog2 = JS_DHASH_BITS - table->hashShift;
|
|
|
|
|
hash2 = HASH2(keyHash, sizeLog2, hashShift);
|
|
|
|
|
sizeMask = JS_BITMASK(sizeLog2);
|
|
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
|
JS_ASSERT(!ENTRY_IS_REMOVED(entry));
|
|
|
|
|
entry->keyHash |= COLLISION_FLAG;
|
|
|
|
|
|
|
|
|
|
METER(table->stats.steps++);
|
|
|
|
|
hash1 -= hash2;
|
|
|
|
|
hash1 &= sizeMask;
|
|
|
|
|
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
if (JS_DHASH_ENTRY_IS_FREE(entry)) {
|
|
|
|
|
METER(table->stats.misses++);
|
|
|
|
|
return entry;
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* NOTREACHED */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static JSBool
|
|
|
|
|
ChangeTable(JSDHashTable *table, int deltaLog2)
|
|
|
|
|
{
|
|
|
|
|
int oldLog2, newLog2;
|
|
|
|
|
uint32 oldCapacity, newCapacity;
|
|
|
|
|
char *newEntryStore, *oldEntryStore, *oldEntryAddr;
|
|
|
|
|
uint32 entrySize, i, nbytes;
|
|
|
|
|
JSDHashEntryHdr *oldEntry, *newEntry;
|
|
|
|
|
JSDHashMoveEntry moveEntry;
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
#ifdef DEBUG
|
|
|
|
|
uint32 recursionLevel;
|
|
|
|
|
#endif
|
2018-09-08 18:08:48 +08:00
|
|
|
|
|
|
|
|
/* Look, but don't touch, until we succeed in getting new entry store. */
|
|
|
|
|
oldLog2 = JS_DHASH_BITS - table->hashShift;
|
|
|
|
|
newLog2 = oldLog2 + deltaLog2;
|
|
|
|
|
oldCapacity = JS_BIT(oldLog2);
|
|
|
|
|
newCapacity = JS_BIT(newLog2);
|
|
|
|
|
if (newCapacity >= JS_DHASH_SIZE_LIMIT)
|
|
|
|
|
return JS_FALSE;
|
|
|
|
|
entrySize = table->entrySize;
|
|
|
|
|
nbytes = newCapacity * entrySize;
|
|
|
|
|
|
2023-07-12 13:27:26 +10:00
|
|
|
newEntryStore = (char *) table->ops->allocTable(table,
|
|
|
|
|
nbytes + ENTRY_STORE_EXTRA);
|
2018-09-08 18:08:48 +08:00
|
|
|
if (!newEntryStore)
|
|
|
|
|
return JS_FALSE;
|
|
|
|
|
|
|
|
|
|
/* We can't fail from here on, so update table parameters. */
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
#ifdef DEBUG
|
|
|
|
|
recursionLevel = RECURSION_LEVEL(table);
|
|
|
|
|
#endif
|
2018-09-08 18:08:48 +08:00
|
|
|
table->hashShift = JS_DHASH_BITS - newLog2;
|
|
|
|
|
table->removedCount = 0;
|
|
|
|
|
table->generation++;
|
|
|
|
|
|
|
|
|
|
/* Assign the new entry store to table. */
|
|
|
|
|
memset(newEntryStore, 0, nbytes);
|
|
|
|
|
oldEntryAddr = oldEntryStore = table->entryStore;
|
|
|
|
|
table->entryStore = newEntryStore;
|
|
|
|
|
moveEntry = table->ops->moveEntry;
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
#ifdef DEBUG
|
|
|
|
|
RECURSION_LEVEL(table) = recursionLevel;
|
|
|
|
|
#endif
|
2018-09-08 18:08:48 +08:00
|
|
|
|
|
|
|
|
/* Copy only live entries, leaving removed ones behind. */
|
|
|
|
|
for (i = 0; i < oldCapacity; i++) {
|
|
|
|
|
oldEntry = (JSDHashEntryHdr *)oldEntryAddr;
|
|
|
|
|
if (ENTRY_IS_LIVE(oldEntry)) {
|
|
|
|
|
oldEntry->keyHash &= ~COLLISION_FLAG;
|
2023-07-12 13:27:26 +10:00
|
|
|
newEntry = FindFreeEntry(table, oldEntry->keyHash);
|
2018-09-08 18:08:48 +08:00
|
|
|
JS_ASSERT(JS_DHASH_ENTRY_IS_FREE(newEntry));
|
|
|
|
|
moveEntry(table, oldEntry, newEntry);
|
|
|
|
|
newEntry->keyHash = oldEntry->keyHash;
|
|
|
|
|
}
|
|
|
|
|
oldEntryAddr += entrySize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table->ops->freeTable(table, oldEntryStore);
|
|
|
|
|
return JS_TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(JSDHashEntryHdr *) JS_DHASH_FASTCALL
|
|
|
|
|
JS_DHashTableOperate(JSDHashTable *table, const void *key, JSDHashOperator op)
|
|
|
|
|
{
|
|
|
|
|
JSDHashNumber keyHash;
|
|
|
|
|
JSDHashEntryHdr *entry;
|
|
|
|
|
uint32 size;
|
|
|
|
|
int deltaLog2;
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
JS_ASSERT(op == JS_DHASH_LOOKUP || RECURSION_LEVEL(table) == 0);
|
|
|
|
|
INCREMENT_RECURSION_LEVEL(table);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
keyHash = table->ops->hashKey(table, key);
|
|
|
|
|
keyHash *= JS_DHASH_GOLDEN_RATIO;
|
|
|
|
|
|
|
|
|
|
/* Avoid 0 and 1 hash codes, they indicate free and removed entries. */
|
|
|
|
|
ENSURE_LIVE_KEYHASH(keyHash);
|
|
|
|
|
keyHash &= ~COLLISION_FLAG;
|
|
|
|
|
|
|
|
|
|
switch (op) {
|
|
|
|
|
case JS_DHASH_LOOKUP:
|
|
|
|
|
METER(table->stats.lookups++);
|
|
|
|
|
entry = SearchTable(table, key, keyHash, op);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case JS_DHASH_ADD:
|
|
|
|
|
/*
|
|
|
|
|
* If alpha is >= .75, grow or compress the table. If key is already
|
|
|
|
|
* in the table, we may grow once more than necessary, but only if we
|
|
|
|
|
* are on the edge of being overloaded.
|
|
|
|
|
*/
|
|
|
|
|
size = JS_DHASH_TABLE_SIZE(table);
|
|
|
|
|
if (table->entryCount + table->removedCount >= MAX_LOAD(table, size)) {
|
|
|
|
|
/* Compress if a quarter or more of all entries are removed. */
|
|
|
|
|
if (table->removedCount >= size >> 2) {
|
|
|
|
|
METER(table->stats.compresses++);
|
|
|
|
|
deltaLog2 = 0;
|
|
|
|
|
} else {
|
|
|
|
|
METER(table->stats.grows++);
|
|
|
|
|
deltaLog2 = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Grow or compress table, returning null if ChangeTable fails and
|
|
|
|
|
* falling through might claim the last free entry.
|
|
|
|
|
*/
|
|
|
|
|
if (!ChangeTable(table, deltaLog2) &&
|
|
|
|
|
table->entryCount + table->removedCount == size - 1) {
|
|
|
|
|
METER(table->stats.addFailures++);
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
entry = NULL;
|
|
|
|
|
break;
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Look for entry after possibly growing, so we don't have to add it,
|
|
|
|
|
* then skip it while growing the table and re-add it after.
|
|
|
|
|
*/
|
|
|
|
|
entry = SearchTable(table, key, keyHash, op);
|
|
|
|
|
if (!ENTRY_IS_LIVE(entry)) {
|
|
|
|
|
/* Initialize the entry, indicating that it's no longer free. */
|
|
|
|
|
METER(table->stats.addMisses++);
|
|
|
|
|
if (ENTRY_IS_REMOVED(entry)) {
|
|
|
|
|
METER(table->stats.addOverRemoved++);
|
|
|
|
|
table->removedCount--;
|
|
|
|
|
keyHash |= COLLISION_FLAG;
|
|
|
|
|
}
|
|
|
|
|
if (table->ops->initEntry &&
|
|
|
|
|
!table->ops->initEntry(table, entry, key)) {
|
|
|
|
|
/* We haven't claimed entry yet; fail with null return. */
|
|
|
|
|
memset(entry + 1, 0, table->entrySize - sizeof *entry);
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
entry = NULL;
|
|
|
|
|
break;
|
2018-09-08 18:08:48 +08:00
|
|
|
}
|
|
|
|
|
entry->keyHash = keyHash;
|
|
|
|
|
table->entryCount++;
|
|
|
|
|
}
|
|
|
|
|
METER(else table->stats.addHits++);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case JS_DHASH_REMOVE:
|
|
|
|
|
entry = SearchTable(table, key, keyHash, op);
|
|
|
|
|
if (ENTRY_IS_LIVE(entry)) {
|
|
|
|
|
/* Clear this entry and mark it as "removed". */
|
|
|
|
|
METER(table->stats.removeHits++);
|
|
|
|
|
JS_DHashTableRawRemove(table, entry);
|
|
|
|
|
|
|
|
|
|
/* Shrink if alpha is <= .25 and table isn't too small already. */
|
|
|
|
|
size = JS_DHASH_TABLE_SIZE(table);
|
|
|
|
|
if (size > JS_DHASH_MIN_SIZE &&
|
|
|
|
|
table->entryCount <= MIN_LOAD(table, size)) {
|
|
|
|
|
METER(table->stats.shrinks++);
|
|
|
|
|
(void) ChangeTable(table, -1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
METER(else table->stats.removeMisses++);
|
|
|
|
|
entry = NULL;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
JS_ASSERT(0);
|
|
|
|
|
entry = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
DECREMENT_RECURSION_LEVEL(table);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
return entry;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashTableRawRemove(JSDHashTable *table, JSDHashEntryHdr *entry)
|
|
|
|
|
{
|
|
|
|
|
JSDHashNumber keyHash; /* load first in case clearEntry goofs it */
|
|
|
|
|
|
2025-02-05 12:40:54 +10:00
|
|
|
JS_ASSERT(RECURSION_LEVEL(table) != IMMUTABLE_RECURSION_LEVEL);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
JS_ASSERT(JS_DHASH_ENTRY_IS_LIVE(entry));
|
|
|
|
|
keyHash = entry->keyHash;
|
|
|
|
|
table->ops->clearEntry(table, entry);
|
|
|
|
|
if (keyHash & COLLISION_FLAG) {
|
|
|
|
|
MARK_ENTRY_REMOVED(entry);
|
|
|
|
|
table->removedCount++;
|
|
|
|
|
} else {
|
|
|
|
|
METER(table->stats.removeFrees++);
|
|
|
|
|
MARK_ENTRY_FREE(entry);
|
|
|
|
|
}
|
|
|
|
|
table->entryCount--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(uint32)
|
|
|
|
|
JS_DHashTableEnumerate(JSDHashTable *table, JSDHashEnumerator etor, void *arg)
|
|
|
|
|
{
|
|
|
|
|
char *entryAddr, *entryLimit;
|
|
|
|
|
uint32 i, capacity, entrySize, ceiling;
|
|
|
|
|
JSBool didRemove;
|
|
|
|
|
JSDHashEntryHdr *entry;
|
|
|
|
|
JSDHashOperator op;
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
INCREMENT_RECURSION_LEVEL(table);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
entryAddr = table->entryStore;
|
|
|
|
|
entrySize = table->entrySize;
|
|
|
|
|
capacity = JS_DHASH_TABLE_SIZE(table);
|
|
|
|
|
entryLimit = entryAddr + capacity * entrySize;
|
|
|
|
|
i = 0;
|
|
|
|
|
didRemove = JS_FALSE;
|
|
|
|
|
while (entryAddr < entryLimit) {
|
|
|
|
|
entry = (JSDHashEntryHdr *)entryAddr;
|
|
|
|
|
if (ENTRY_IS_LIVE(entry)) {
|
|
|
|
|
op = etor(table, entry, i++, arg);
|
|
|
|
|
if (op & JS_DHASH_REMOVE) {
|
|
|
|
|
METER(table->stats.removeEnums++);
|
|
|
|
|
JS_DHashTableRawRemove(table, entry);
|
|
|
|
|
didRemove = JS_TRUE;
|
|
|
|
|
}
|
|
|
|
|
if (op & JS_DHASH_STOP)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
entryAddr += entrySize;
|
|
|
|
|
}
|
|
|
|
|
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
JS_ASSERT(!didRemove || RECURSION_LEVEL(table) == 1);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
/*
|
|
|
|
|
* Shrink or compress if a quarter or more of all entries are removed, or
|
|
|
|
|
* if the table is underloaded according to the configured minimum alpha,
|
|
|
|
|
* and is not minimal-size already. Do this only if we removed above, so
|
|
|
|
|
* non-removing enumerations can count on stable table->entryStore until
|
|
|
|
|
* the next non-lookup-Operate or removing-Enumerate.
|
|
|
|
|
*/
|
|
|
|
|
if (didRemove &&
|
|
|
|
|
(table->removedCount >= capacity >> 2 ||
|
|
|
|
|
(capacity > JS_DHASH_MIN_SIZE &&
|
|
|
|
|
table->entryCount <= MIN_LOAD(table, capacity)))) {
|
|
|
|
|
METER(table->stats.enumShrinks++);
|
|
|
|
|
capacity = table->entryCount;
|
|
|
|
|
capacity += capacity >> 1;
|
|
|
|
|
if (capacity < JS_DHASH_MIN_SIZE)
|
|
|
|
|
capacity = JS_DHASH_MIN_SIZE;
|
|
|
|
|
|
|
|
|
|
JS_CEILING_LOG2(ceiling, capacity);
|
|
|
|
|
ceiling -= JS_DHASH_BITS - table->hashShift;
|
|
|
|
|
|
|
|
|
|
(void) ChangeTable(table, ceiling);
|
|
|
|
|
}
|
Numerous changes with focus on feature and stability parity across Windows, Linux and MacOS platforms
Added new Makefile that handles compiling UOX3 and Spidermonkey on both Linux and MacOS (punt)
Added VS solution (SpiderMonkey.sln) and VC++ project files for compiling SpiderMonkey on Windows (Xuri)
Updated SpiderMonkey from v1.6.0 to v1.7.0
Added optimization flag -O2 for release build in CMakeLists.txt in project root (Xuri)
Added StringUtility file with general common string manipulation functions (punt)
Updated RandomNum function to use a "seedless" random number generator from C++11 instead of the old C rand() function. (punt)
Overall code cleanup to remove/replace platform-dependent code (punt)
Replaced potentially unsafe usage of C string stuff like sprintf, vsprintf, vsnprintf, strncat, strcpy and strlen throughout the code with calls to a format() function containing only a single, safe use of vsnprintf, ensuring there's a single place of failure if there's anything to fix and and making it easy to potentially replace this with std::format from C++20 when the time comes. (punt)
Replaced usage of char in many places with std::string (punt)
Started process of replacing UString usage with functions provided through StringUtility instead (punt)
Replaced platform specific fileIO handling in Windows/Linux with cross-platform C++17 standard std::filesystem (punt)
Replaced platform specific time handling by using cross-platform chrono library (punt)
Removed UOX namespace to reduce complexity (punt)
Elimitated template code approach to singletons for more modern c++ constructs, removing dependices in the process (punt)
Removed ODBC support; it hasn't been touched since the initial implementation in 2008, and there is a lack of someone to maintain the code. (punt)
Removed some platform specific files like uoxlinux.h, which is no longer required (punt)
Removed legacy crash protection code, and removed support for cluox (punt)
Removed legacy "support" for Borland compiler (punt)
Removed legacy VC++ 6 Workspace/Project files, VS2005 Solution/Project files, as these are no longer supported (Xuri)
Removed legacy BUILD folder with outdated compilation instructions (Xuri)
Removed old Changelog file (merged into Changelog.txt) (Xuri)
Fixed a pointer bug for items in multis on world load (punt)
Fixed a dictionary related issue that caused segmentation faults on Linux/MacOS (punt)
Fixed an issue with callbacks to JS scripts that caused segmentation faults on Linux/MacOS (punt)
Paths in uox.ini should now load properly on all platforms regardless of whether those paths use slashes or backslashes, and whether or not they end in a slash/backslash. (punt)
Moved to c++17 style of threading, and got rid of threadsafeobject.cpp/h (punt)
Replaced parsing of UOX.INI tags with a system that's more easily maintainable (punt)
Added some new commands to js/commands/custom/misc-cmd.js (Xuri)
cont // Targeted item will be made a container, set to nondecay and movable 2
endfight // Targeted character (and character being fought) will stop fighting
getmulti // Get multiObject for targeted item
finditem // Find item at layer X
movespeed // Set movement speed of target player (0x0 Normal, 0x1 Mounted, 0x2 Slow (walk only), 0x3 Hybrid ("jog"?), 0x4 Frozen)
Added new HTML based documentation in docs folder, and removed many old legacy docs that are either incorporated into this document already or no longer relevant for the current UOX3 version (Xuri)
Co-Authored-By: Charles Kerr <punt1959@users.noreply.github.com>
2020-09-07 18:09:55 +08:00
|
|
|
|
|
|
|
|
DECREMENT_RECURSION_LEVEL(table);
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
2025-02-05 12:40:54 +10:00
|
|
|
#ifdef DEBUG
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashMarkTableImmutable(JSDHashTable *table)
|
|
|
|
|
{
|
|
|
|
|
RECURSION_LEVEL(table) = IMMUTABLE_RECURSION_LEVEL;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2018-09-08 18:08:48 +08:00
|
|
|
#ifdef JS_DHASHMETER
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
|
|
JS_PUBLIC_API(void)
|
|
|
|
|
JS_DHashTableDumpMeter(JSDHashTable *table, JSDHashEnumerator dump, FILE *fp)
|
|
|
|
|
{
|
|
|
|
|
char *entryAddr;
|
|
|
|
|
uint32 entrySize, entryCount;
|
|
|
|
|
int hashShift, sizeLog2;
|
|
|
|
|
uint32 i, tableSize, sizeMask, chainLen, maxChainLen, chainCount;
|
|
|
|
|
JSDHashNumber hash1, hash2, saveHash1, maxChainHash1, maxChainHash2;
|
|
|
|
|
double sqsum, mean, variance, sigma;
|
|
|
|
|
JSDHashEntryHdr *entry, *probe;
|
|
|
|
|
|
|
|
|
|
entryAddr = table->entryStore;
|
|
|
|
|
entrySize = table->entrySize;
|
|
|
|
|
hashShift = table->hashShift;
|
|
|
|
|
sizeLog2 = JS_DHASH_BITS - hashShift;
|
|
|
|
|
tableSize = JS_DHASH_TABLE_SIZE(table);
|
|
|
|
|
sizeMask = JS_BITMASK(sizeLog2);
|
|
|
|
|
chainCount = maxChainLen = 0;
|
|
|
|
|
hash2 = 0;
|
|
|
|
|
sqsum = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < tableSize; i++) {
|
|
|
|
|
entry = (JSDHashEntryHdr *)entryAddr;
|
|
|
|
|
entryAddr += entrySize;
|
|
|
|
|
if (!ENTRY_IS_LIVE(entry))
|
|
|
|
|
continue;
|
|
|
|
|
hash1 = HASH1(entry->keyHash & ~COLLISION_FLAG, hashShift);
|
|
|
|
|
saveHash1 = hash1;
|
|
|
|
|
probe = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
chainLen = 1;
|
|
|
|
|
if (probe == entry) {
|
|
|
|
|
/* Start of a (possibly unit-length) chain. */
|
|
|
|
|
chainCount++;
|
|
|
|
|
} else {
|
|
|
|
|
hash2 = HASH2(entry->keyHash & ~COLLISION_FLAG, sizeLog2,
|
|
|
|
|
hashShift);
|
|
|
|
|
do {
|
|
|
|
|
chainLen++;
|
|
|
|
|
hash1 -= hash2;
|
|
|
|
|
hash1 &= sizeMask;
|
|
|
|
|
probe = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
} while (probe != entry);
|
|
|
|
|
}
|
|
|
|
|
sqsum += chainLen * chainLen;
|
|
|
|
|
if (chainLen > maxChainLen) {
|
|
|
|
|
maxChainLen = chainLen;
|
|
|
|
|
maxChainHash1 = saveHash1;
|
|
|
|
|
maxChainHash2 = hash2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
entryCount = table->entryCount;
|
|
|
|
|
if (entryCount && chainCount) {
|
|
|
|
|
mean = (double)entryCount / chainCount;
|
|
|
|
|
variance = chainCount * sqsum - entryCount * entryCount;
|
|
|
|
|
if (variance < 0 || chainCount == 1)
|
|
|
|
|
variance = 0;
|
|
|
|
|
else
|
|
|
|
|
variance /= chainCount * (chainCount - 1);
|
|
|
|
|
sigma = sqrt(variance);
|
|
|
|
|
} else {
|
|
|
|
|
mean = sigma = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fprintf(fp, "Double hashing statistics:\n");
|
|
|
|
|
fprintf(fp, " table size (in entries): %u\n", tableSize);
|
|
|
|
|
fprintf(fp, " number of entries: %u\n", table->entryCount);
|
|
|
|
|
fprintf(fp, " number of removed entries: %u\n", table->removedCount);
|
|
|
|
|
fprintf(fp, " number of searches: %u\n", table->stats.searches);
|
|
|
|
|
fprintf(fp, " number of hits: %u\n", table->stats.hits);
|
|
|
|
|
fprintf(fp, " number of misses: %u\n", table->stats.misses);
|
|
|
|
|
fprintf(fp, " mean steps per search: %g\n", table->stats.searches ?
|
|
|
|
|
(double)table->stats.steps
|
|
|
|
|
/ table->stats.searches :
|
|
|
|
|
0.);
|
|
|
|
|
fprintf(fp, " mean hash chain length: %g\n", mean);
|
|
|
|
|
fprintf(fp, " standard deviation: %g\n", sigma);
|
|
|
|
|
fprintf(fp, " maximum hash chain length: %u\n", maxChainLen);
|
|
|
|
|
fprintf(fp, " number of lookups: %u\n", table->stats.lookups);
|
|
|
|
|
fprintf(fp, " adds that made a new entry: %u\n", table->stats.addMisses);
|
|
|
|
|
fprintf(fp, "adds that recycled removeds: %u\n", table->stats.addOverRemoved);
|
|
|
|
|
fprintf(fp, " adds that found an entry: %u\n", table->stats.addHits);
|
|
|
|
|
fprintf(fp, " add failures: %u\n", table->stats.addFailures);
|
|
|
|
|
fprintf(fp, " useful removes: %u\n", table->stats.removeHits);
|
|
|
|
|
fprintf(fp, " useless removes: %u\n", table->stats.removeMisses);
|
|
|
|
|
fprintf(fp, "removes that freed an entry: %u\n", table->stats.removeFrees);
|
|
|
|
|
fprintf(fp, " removes while enumerating: %u\n", table->stats.removeEnums);
|
|
|
|
|
fprintf(fp, " number of grows: %u\n", table->stats.grows);
|
|
|
|
|
fprintf(fp, " number of shrinks: %u\n", table->stats.shrinks);
|
|
|
|
|
fprintf(fp, " number of compresses: %u\n", table->stats.compresses);
|
|
|
|
|
fprintf(fp, "number of enumerate shrinks: %u\n", table->stats.enumShrinks);
|
|
|
|
|
|
|
|
|
|
if (dump && maxChainLen && hash2) {
|
|
|
|
|
fputs("Maximum hash chain:\n", fp);
|
|
|
|
|
hash1 = maxChainHash1;
|
|
|
|
|
hash2 = maxChainHash2;
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
i = 0;
|
|
|
|
|
do {
|
|
|
|
|
if (dump(table, entry, i++, fp) != JS_DHASH_NEXT)
|
|
|
|
|
break;
|
|
|
|
|
hash1 -= hash2;
|
|
|
|
|
hash1 &= sizeMask;
|
|
|
|
|
entry = ADDRESS_ENTRY(table, hash1);
|
|
|
|
|
} while (JS_DHASH_ENTRY_IS_BUSY(entry));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* JS_DHASHMETER */
|