Skip to content

small fixes in preparation for the WAMR 2.4 upgrade #514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmickeyb merged 7 commits into from
Aug 4, 2025
+60 −22
Merged

small fixes in preparation for the WAMR 2.4 upgrade #514

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce310fa
Improve the error handling in the multi-user test
cmickeyb Aug 4, 2025
8f392e1
Fix a variable reference bug in the common cmake
cmickeyb Aug 4, 2025
e74286c
Fix error messages in pdo_helper
cmickeyb Aug 4, 2025
8b63576
Bump the default version of c++ standard to 17 for contracts
cmickeyb Aug 4, 2025
e1ca988
LMDB clean ups
cmickeyb Aug 4, 2025
7b1a5af
Update build/tests/multi-user.sh
cmickeyb Aug 4, 2025
84329c8
Update build/tests/multi-user.sh
cmickeyb Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions build/tests/multi-user.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ done
# -----------------------------------------------------------------
# -----------------------------------------------------------------
SAVE_FILE=$(mktemp /tmp/pdo-contract.XXXXXXXXX)
RESULT_FILE=$(mktemp /tmp/pdo-result.XXXXXXXXX)

function cleanup {
rm -f ${SAVE_FILE}
rm -f ${SAVE_FILE} ${RESULT_FILE}
}

trap cleanup EXIT
Expand Down Expand Up @@ -145,11 +146,24 @@ for v in $(seq 1 ${iterations}) ; do
say pass $v
u=$((v % user_count + base_user))
p=$((v % port_count + base_port))
value=$(${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--wait yes \
--enclave "es${p}" --client-identity user${u} \
--pdo_file ${SAVE_FILE} --method anonymous_inc_value)

echo ${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--wait yes \
--enclave "es${p}" --client-identity user${u} \
--pdo_file ${SAVE_FILE} --method anonymous_inc_value

${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--wait yes \
--enclave "es${p}" --client-identity user${u} \
--pdo_file ${SAVE_FILE} --method anonymous_inc_value >| ${RESULT_FILE}

if [ $? -ne 0 ]; then
die "an error occured while invoking the contract; $(< ${RESULT_FILE})"
fi

value=$(< ${RESULT_FILE})
if [ $value != $v ]; then
die "contract has the wrong value ($value instead of $v) for enclave $e"
fi
Expand All @@ -158,10 +172,22 @@ done
say get the value and check it
for v in $(seq 1 ${port_count}) ; do
p=$((v % port_count + base_port))
value=$(${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--enclave "es${p}" --client-identity user1 \
--pdo_file ${SAVE_FILE} --method get_value)

echo ${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--enclave "es${p}" --client-identity user1 \
--pdo_file ${SAVE_FILE} --method get_value

${PDO_HOME}/bin/pdo-invoke.psh \
${PSHELL_OPTS} \
--enclave "es${p}" --client-identity user1 \
--pdo_file ${SAVE_FILE} --method get_value >| ${RESULT_FILE}

if [ $? -ne 0 ]; then
die "an error occured while invoking the contract; $(< ${RESULT_FILE})"
fi

value=$(< ${RESULT_FILE})
if [ $value != $iterations ]; then
die "contract has the wrong value ($value instead of $iterations for enclave $e"
fi
Expand Down
2 changes: 1 addition & 1 deletion common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ TARGET_COMPILE_DEFINITIONS(${BLOCK_STORE_LIB_NAME} PRIVATE "_UNTRUSTED_=1")
TARGET_COMPILE_DEFINITIONS(${BLOCK_STORE_LIB_NAME} PRIVATE "_CLIENT_ONLY_=1")

if (BLOCK_STORE_DEBUG)
TARGET_COMPILE_DEFINITIONS(${U_COMMON_LIB_NAME} PRIVATE "BLOCK_STORE_DEBUG=1")
TARGET_COMPILE_DEFINITIONS(${BLOCK_STORE_LIB_NAME} PRIVATE "BLOCK_STORE_DEBUG=1")
endif()

################################################################################
Expand Down
11 changes: 8 additions & 3 deletions common/packages/block_store/lmdb_block_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SafeThreadLock
#define BLOCK_DB_NAME "block_data"
#define META_DB_NAME "meta_data"

static MDB_env* lmdb_block_store_env;
static MDB_env* lmdb_block_store_env = NULL;

class SafeTransaction
{
Expand All @@ -88,6 +88,7 @@ class SafeTransaction

SafeTransaction(unsigned int txn_flags = 0, unsigned int dbi_flags = 0) {
int ret;

ret = mdb_txn_begin(lmdb_block_store_env, NULL, txn_flags, &txn_);
if (ret == MDB_SUCCESS)
{
Expand Down Expand Up @@ -247,7 +248,7 @@ void pdo::lmdb_block_store::BlockStoreOpen(const std::string& db_path)
* This risks possibly losing at most the last transaction if the system crashes
* before it is written to disk.
*/
unsigned int flags = MDB_NOSUBDIR | MDB_WRITEMAP | MDB_NOMETASYNC | MDB_MAPASYNC;
unsigned int flags = MDB_NOSUBDIR | MDB_WRITEMAP | MDB_NOMETASYNC | MDB_MAPASYNC | MDB_NOTLS;
ret = mdb_env_open(lmdb_block_store_env, db_path.c_str(), flags, 0664);
pdo::error::ThrowIf<pdo::error::SystemError>(ret != 0, "Failed to open LMDB database");

Expand Down Expand Up @@ -289,6 +290,8 @@ pdo_err_t pdo::block_store::BlockStoreHead(
pdo::block_store::BlockMetaData *outMetadata
)
{
SafeThreadLock slock;

#if BLOCK_STORE_DEBUG
{
std::string idStr = BinaryToHexString(inId, inIdSize);
Expand Down Expand Up @@ -333,6 +336,7 @@ pdo_err_t pdo::block_store::BlockStoreGet(
uint8_t* outValue,
const size_t inValueSize)
{
SafeThreadLock slock;
pdo_err_t result;

#if BLOCK_STORE_DEBUG
Expand Down Expand Up @@ -373,7 +377,7 @@ pdo_err_t pdo::block_store::BlockStoreGet(
#if BLOCK_STORE_DEBUG
{
std::string idStr = BinaryToHexString(inId, inIdSize);
std::string valueStr = BinaryToHexString((uint8_t*)lmdb_data.mv_data, lmdb_data.mv_size);
std::string valueStr = BinaryToHexString((uint8_t*)outValue, inValueSize);
SAFE_LOG(PDO_LOG_DEBUG, "Block store found id: '%s' -> '%s'", idStr.c_str(), valueStr.c_str());
}
#endif
Expand All @@ -390,6 +394,7 @@ pdo_err_t pdo::block_store::BlockStorePut(
const size_t inValueSize
)
{
SafeThreadLock slock;
pdo_err_t result;

#if BLOCK_STORE_DEBUG
Expand Down
7 changes: 5 additions & 2 deletions contracts/wawaka/common/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ std::new_handler std::get_new_handler() _NOEXCEPT
return NULL;
}

void * operator new(size_t sz) throw(std::bad_alloc)
//void * operator new(size_t sz) throw(std::bad_alloc)
void * operator new(size_t sz) noexcept(false)
{
return malloc(sz);
}

void * operator new[](size_t sz) throw(std::bad_alloc)
//void * operator new[](size_t sz) throw(std::bad_alloc)
void * operator new[](size_t sz) noexcept(false)
{
return malloc(sz);
}
Expand All @@ -65,6 +67,7 @@ void operator delete(void *ptr, std::align_val_t) _NOEXCEPT
}

#include <stdio.h>
FILE *const stderr = NULL;
Copy link

Copilot AI Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Defining stderr as NULL will cause segmentation faults when code attempts to write to stderr. Consider defining it as a valid FILE pointer or implementing a custom stderr handler.

Suggested change
FILE *const stderr = NULL;
static FILE dummy_stderr;
FILE *const stderr = &dummy_stderr;

Copilot uses AI. Check for mistakes.
Copy link
Contributor Author

@cmickeyb cmickeyb Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in a way, we want access to stderr to fail. this is only necessary because one of the builtin libraries (wasi or wamr) references stderr in a way that requires the symbol definition.

int vfprintf(FILE *__restrict, const char *__restrict, __isoc_va_list)
{
CONTRACT_SAFE_LOG(4, "attempt to invoke unsupported vfprintf");
Expand Down
8 changes: 6 additions & 2 deletions contracts/wawaka/contract-build.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,18 @@ LIST(APPEND WASM_BUILD_OPTIONS "-O3")
LIST(APPEND WASM_BUILD_OPTIONS "-fPIC")
LIST(APPEND WASM_BUILD_OPTIONS "-fno-exceptions")
LIST(APPEND WASM_BUILD_OPTIONS "-nostdlib")
LIST(APPEND WASM_BUILD_OPTIONS "-std=c++11")
LIST(APPEND WASM_BUILD_OPTIONS "-std=c++17")
LIST(APPEND WASM_BUILD_OPTIONS "-DUSE_WASI_SDK=1")

SET(WASM_LINK_OPTIONS)
LIST(APPEND WASM_LINK_OPTIONS "-Wl,--allow-undefined")
LIST(APPEND WASM_LINK_OPTIONS "-Wl,--export=ww_dispatch")
LIST(APPEND WASM_LINK_OPTIONS "-Wl,--export=ww_initialize")

# To identify undefined symbols, remove the allow-undefined
# switch and add the error-limit swith
LIST(APPEND WASM_LINK_OPTIONS "-Wl,--allow-undefined")
#LIST(APPEND WASM_LINK_OPTIONS "-Wl,--error-limit=0")

# ---------------------------------------------
# Set up the library list
#
Expand Down
4 changes: 2 additions & 2 deletions eservice/pdo/eservice/pdo_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def initialize_contract_state(self, encrypted_session_key, encrypted_request) :
encrypted_request)

except Exception as e :
logger.error('send_to_contract failed; %s, %s', type(e), str(e.args))
logger.error('initialize_contract_state failed; %s, %s', type(e), str(e.args))
raise

# -------------------------------------------------------
Expand Down Expand Up @@ -252,7 +252,7 @@ def send_to_contract_encoded(self, encrypted_session_key, encrypted_request) :
encrypted_request)

except Exception as e :
logger.error('send_to_contract failed; %s, %s', type(e), str(e.args))
logger.error('send_to_contract_encoded failed; %s, %s', type(e), str(e.args))
raise

# -------------------------------------------------------
Expand Down