Page MenuHomePhabricator
Differential D8659

[CommCoreModule] implement C++ ThreadStore
ClosedPublic
Actions

Authored by kamil on Jul 28 2023, 10:55 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 20, 3:15 AM
Unknown Object (File)
Wed, Mar 19, 12:14 PM
Unknown Object (File)
Mar 15 2025, 6:31 PM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
View All Files
Subscribers
ashoat

Details

Reviewers
michal
• jon
atul
tomek
Commits
rCOMMef04728fafd8: [CommCoreModule] implement C++ ThreadStore
Summary

Grouping logic in one class to make it cleaner and reuse some code.

Depends on: D8604

Test Plan

Build iOS and Android and play with threads to make sure functionality still works.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jul 28 2023, 10:55 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 28 2023, 10:56 AM
kamil updated this revision to Diff 29189.Jul 28 2023, 11:07 AM

fix commit

kamil added a parent revision: D8604: [CommCoreModule] implement C++ DraftStore.Jul 28 2023, 11:08 AM
Harbormaster failed remote builds in B21311: Diff 29188!Jul 28 2023, 11:33 AM
Harbormaster failed remote builds in B21312: Diff 29189!Jul 28 2023, 11:35 AM
kamil added a child revision: D8662: [CommCoreModule] implement C++ MessageStore.Jul 29 2023, 2:51 AM
kamil published this revision for review.Jul 31 2023, 1:29 AM
tomek accepted this revision.Jul 31 2023, 3:23 AM
This revision is now accepted and ready to land.Jul 31 2023, 3:23 AM
kamil updated this revision to Diff 29268.Jul 31 2023, 6:21 AM

rebase

This revision was landed with ongoing or failed builds.Jul 31 2023, 8:03 AM
Closed by commit rCOMMef04728fafd8: [CommCoreModule] implement C++ ThreadStore (authored by kamil). · Explain Why
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMef04728fafd8: [CommCoreModule] implement C++ ThreadStore.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
2 lines
2 lines
252 lines
PersistentStorageUtilities/
DataStores/
29 lines
200 lines
ios/
Comm.xcodeproj/
6 lines

Diff 29284

View Options

native/cpp/CommonCpp/NativeModules/CMakeLists.txt

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/ThreadStore.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/ThreadStore.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/ios/Comm.xcodeproj/project.pbxproj

Loading...