mirror of
https://github.com/ChaiScript/ChaiScript.git
synced 2026-07-31 00:37:02 +08:00
96cae78242
The Dispatch_Engine member destruction order destroyed m_state (containing type maps) before m_stack_holder (containing async futures), allowing async threads to access freed type map memory during eval_error formatting. The fix moves async() registration from the stdlib into ChaiScript_Basic with thread tracking, and adds a Dispatch_Engine destructor that joins all tracked async threads before m_state is destroyed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
66 lines
2.0 KiB
C++
66 lines
2.0 KiB
C++
// This file is distributed under the BSD License.
|
|
// See "license.txt" for details.
|
|
// Copyright 2009-2012, Jonathan Turner (jonathan@emptycrate.com)
|
|
// and Jason Turner (jason@emptycrate.com)
|
|
// http://www.chaiscript.com
|
|
|
|
#ifndef CHAISCRIPT_STDLIB_HPP_
|
|
#define CHAISCRIPT_STDLIB_HPP_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "chaiscript_defines.hpp"
|
|
#include "language/chaiscript_common.hpp"
|
|
|
|
#include "dispatchkit/function_call.hpp"
|
|
|
|
//#include "dispatchkit/dispatchkit.hpp"
|
|
#include "dispatchkit/bootstrap.hpp"
|
|
#include "dispatchkit/bootstrap_stl.hpp"
|
|
#include "dispatchkit/operators.hpp"
|
|
//#include "dispatchkit/boxed_value.hpp"
|
|
#include "dispatchkit/register_function.hpp"
|
|
#include "language/chaiscript_prelude.hpp"
|
|
#include "utility/json_wrap.hpp"
|
|
|
|
#ifndef CHAISCRIPT_NO_THREADS
|
|
#include <future>
|
|
#endif
|
|
|
|
/// @file
|
|
///
|
|
/// This file generates the standard library that normal ChaiScript usage requires.
|
|
|
|
namespace chaiscript {
|
|
class Std_Lib {
|
|
public:
|
|
[[nodiscard]] static ModulePtr library() {
|
|
auto lib = std::make_shared<Module>();
|
|
bootstrap::Bootstrap::bootstrap(*lib);
|
|
|
|
bootstrap::standard_library::vector_type<std::vector<Boxed_Value>>("Vector", *lib);
|
|
bootstrap::standard_library::string_type<std::string>("string", *lib);
|
|
bootstrap::standard_library::map_type<std::map<std::string, Boxed_Value>>("Map", *lib);
|
|
bootstrap::standard_library::pair_type<std::pair<Boxed_Value, Boxed_Value>>("Pair", *lib);
|
|
|
|
#ifndef CHAISCRIPT_NO_THREADS
|
|
bootstrap::standard_library::future_type<std::future<chaiscript::Boxed_Value>>("future", *lib);
|
|
// Note: the async() function is registered in ChaiScript_Basic::build_eval_system()
|
|
// with thread tracking to prevent heap-use-after-free on engine destruction (issue #636).
|
|
#endif
|
|
|
|
json_wrap::library(*lib);
|
|
|
|
lib->eval(ChaiScript_Prelude::chaiscript_prelude() /*, "standard prelude"*/);
|
|
|
|
return lib;
|
|
}
|
|
};
|
|
} // namespace chaiscript
|
|
|
|
#endif
|