diff options
| author | Marcos Magueta <maguetamarcos@gmail.com> | 2026-05-18 12:41:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-18 12:41:08 -0300 |
| commit | f9097a0562ea8b40d40a19059578a9280b945de4 (patch) | |
| tree | 67907194b90977758c6b024809eb887a44601935 | |
| parent | d39b1433e2ed754640049d04462f6a151bce7d14 (diff) | |
| download | Sakura-f9097a0562ea8b40d40a19059578a9280b945de4.tar.gz Sakura-f9097a0562ea8b40d40a19059578a9280b945de4.zip | |
cleanup root
Diffstat (limited to '')
| -rw-r--r-- | config/config-unix.sexp (renamed from config-unix.sexp) | 0 | ||||
| -rw-r--r-- | config/config.sexp (renamed from config.sexp) | 0 | ||||
| -rw-r--r-- | config/http_demo_commands.sexp (renamed from http_demo_commands.sexp) | 0 | ||||
| -rw-r--r-- | run_tcp.ps1 | 175 | ||||
| -rw-r--r-- | run_tree.ps1 | 38 | ||||
| -rw-r--r-- | shared/librelational_engine/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | shared/librelational_engine/library.cpp | 23 | ||||
| -rw-r--r-- | shared/librelational_engine/library.h | 8 |
8 files changed, 0 insertions, 255 deletions
diff --git a/config-unix.sexp b/config/config-unix.sexp index 7598840..7598840 100644 --- a/config-unix.sexp +++ b/config/config-unix.sexp diff --git a/config.sexp b/config/config.sexp index 67a48a5..67a48a5 100644 --- a/config.sexp +++ b/config/config.sexp diff --git a/http_demo_commands.sexp b/config/http_demo_commands.sexp index 680831f..680831f 100644 --- a/http_demo_commands.sexp +++ b/config/http_demo_commands.sexp diff --git a/run_tcp.ps1 b/run_tcp.ps1 deleted file mode 100644 index 175fc26..0000000 --- a/run_tcp.ps1 +++ /dev/null @@ -1,175 +0,0 @@ -param( - [string]$ConfigPath = ".\config.sexp", - [string]$ServerHost = "127.0.0.1", - [int]$Port = 7777, - [string[]]$Command, - [string]$CommandsPath, - [switch]$UseExistingServer, - [switch]$UseLocalServer, - [switch]$SkipBuild, - [switch]$NoInteractive -) - -$ErrorActionPreference = "Stop" - -function Invoke-Build { - Write-Host "Building Sakura..." - dune build - if (-not $?) { - throw "Build failed." - } -} - -function Start-SakuraServer { - param( - [string]$Config, - [string]$WorkingDirectory, - [switch]$UseOpam - ) - - Write-Host "Starting Sakura server with config $Config ..." - $filePath = "dune" - $serverArgs = @("exec", "sakura-server", "--", $Config) - if ($UseOpam) { - $filePath = "opam" - $serverArgs = @("exec", "--", "sakura-server", $Config) - } - - $proc = Start-Process -FilePath $filePath ` - -ArgumentList $serverArgs ` - -WorkingDirectory $WorkingDirectory ` - -PassThru - - return $proc -} - -function Wait-ForTcp { - param( - [string]$TargetHost, - [int]$TargetPort, - [int]$TimeoutSeconds = 20 - ) - - $deadline = (Get-Date).AddSeconds($TimeoutSeconds) - while ((Get-Date) -lt $deadline) { - $client = $null - try { - $client = [System.Net.Sockets.TcpClient]::new() - $async = $client.BeginConnect($TargetHost, $TargetPort, $null, $null) - if ($async.AsyncWaitHandle.WaitOne(250)) { - $client.EndConnect($async) - $client.Close() - return - } - $client.Close() - } catch { - if ($null -ne $client) { - $client.Close() - } - Start-Sleep -Milliseconds 250 - } - } - - throw "Timed out waiting for TCP server at $TargetHost`:$TargetPort" -} - -function Connect-Tcp { - param( - [string]$TargetHost, - [int]$TargetPort - ) - - $client = [System.Net.Sockets.TcpClient]::new($TargetHost, $TargetPort) - $stream = $client.GetStream() - $writer = [System.IO.StreamWriter]::new($stream) - $writer.AutoFlush = $true - $reader = [System.IO.StreamReader]::new($stream) - - return @{ - Client = $client - Writer = $writer - Reader = $reader - } -} - -function Send-Command { - param( - [System.IO.StreamWriter]$Writer, - [System.IO.StreamReader]$Reader, - [string]$Line - ) - - $Writer.WriteLine($Line) - $response = $Reader.ReadLine() - if ($null -eq $response) { - throw "Connection closed by server." - } - - Write-Host "< $response" -} - -$repoRoot = $PSScriptRoot -$serverProcess = $null - -try { - if (-not $SkipBuild) { - Invoke-Build - } - - if (-not $UseExistingServer) { - if ($UseLocalServer) { - Write-Host "Server mode: local dune exec sakura-server" - } else { - Write-Host "Server mode: opam-installed sakura-server" - } - $serverProcess = Start-SakuraServer -Config $ConfigPath -WorkingDirectory $repoRoot -UseOpam:(-not $UseLocalServer) - Wait-ForTcp -TargetHost $ServerHost -TargetPort $Port - Write-Host "Server is ready on $ServerHost`:$Port" - } - - $conn = Connect-Tcp -TargetHost $ServerHost -TargetPort $Port - $writer = $conn.Writer - $reader = $conn.Reader - - $commandsToSend = @() - if ($null -ne $Command -and $Command.Count -gt 0) { - $commandsToSend += $Command - } - if (-not [string]::IsNullOrWhiteSpace($CommandsPath)) { - $fileCommands = Get-Content -Path $CommandsPath | - Where-Object { -not [string]::IsNullOrWhiteSpace($_) } - $commandsToSend += $fileCommands - } - - if ($commandsToSend.Count -gt 0) { - foreach ($cmd in $commandsToSend) { - Write-Host "> $cmd" - Send-Command -Writer $writer -Reader $reader -Line $cmd - } - } - - if (-not $NoInteractive) { - Write-Host "Interactive mode. Type :quit to exit." - while ($true) { - $line = Read-Host ">" - if ($line -eq ":quit") { - break - } - if ([string]::IsNullOrWhiteSpace($line)) { - continue - } - - Send-Command -Writer $writer -Reader $reader -Line $line - } - } - - $writer.Dispose() - $reader.Dispose() - $conn.Client.Close() -} -finally { - if ($null -ne $serverProcess -and -not $serverProcess.HasExited) { - Write-Host "Stopping Sakura server (PID $($serverProcess.Id))" - Stop-Process -Id $serverProcess.Id -Force - } -} diff --git a/run_tree.ps1 b/run_tree.ps1 deleted file mode 100644 index 7f74bac..0000000 --- a/run_tree.ps1 +++ /dev/null @@ -1,38 +0,0 @@ -param( - [switch]$NoRun -) - -$ErrorActionPreference = "Stop" - -$repoRoot = $PSScriptRoot -$projectName = Split-Path -Leaf $repoRoot - -Push-Location $repoRoot -try { - (& opam env) -split '\r?\n' | ForEach-Object { - if ($_ -ne "") { - Invoke-Expression $_ - } - } - - dune build shared/shabptree/sakura_shabptree.dll bin/tree.exe - - $dll = @( - Get-ChildItem -Path $repoRoot -Filter sakura_shabptree.dll -Recurse -ErrorAction SilentlyContinue - Get-ChildItem -Path (Join-Path $repoRoot "..") -Filter sakura_shabptree.dll -Recurse -ErrorAction SilentlyContinue | - Where-Object { $_.FullName -like "*\_build\*\$projectName\shared\shabptree\sakura_shabptree.dll" } - ) | Select-Object -First 1 - - if ($null -eq $dll) { - throw "Could not find built sakura_shabptree.dll" - } - - $env:SAKURA_BPLUSTREE_DLL = $dll.FullName - - if (-not $NoRun) { - dune exec bin/tree.exe - } -} -finally { - Pop-Location -} diff --git a/shared/librelational_engine/CMakeLists.txt b/shared/librelational_engine/CMakeLists.txt deleted file mode 100644 index 22c8444..0000000 --- a/shared/librelational_engine/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.29) -project(relational_engine) - -include_directories($ENV{LIBRESSL_INCLUDE_PATH}) - -add_library(relational_engine SHARED library.cpp) - -target_link_libraries(relational_engine - $ENV{LIBRESSL_LIB_PATH}/libssl.$ENV{OS_LIB_EXTENSION} - $ENV{LIBRESSL_LIB_PATH}/libcrypto.$ENV{OS_LIB_EXTENSION} -)
\ No newline at end of file diff --git a/shared/librelational_engine/library.cpp b/shared/librelational_engine/library.cpp deleted file mode 100644 index a9b4c81..0000000 --- a/shared/librelational_engine/library.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include <iostream> -#include <openssl/sha.h> -#include <iomanip> -#include <sstream> -#include <cstring> - -#include <sys/stat.h> - -extern "C" { -#include "library.h" - - extern void compute_hash(char* computed_hash, const char *content) { - unsigned char hash[SHA256_DIGEST_LENGTH]; - SHA256_CTX sha256; - SHA256_Init(&sha256); - SHA256_Update(&sha256, content, std::strlen(content)); - SHA256_Final(hash, &sha256); - std::stringstream ss; - for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) - ss << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(hash[i]); - std::memcpy(computed_hash, ss.str().c_str(), HASH_SIZE); - } -} diff --git a/shared/librelational_engine/library.h b/shared/librelational_engine/library.h deleted file mode 100644 index cae22cb..0000000 --- a/shared/librelational_engine/library.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RELATIONAL_ENGINE_LIBRARY_H -#define RELATIONAL_ENGINE_LIBRARY_H - -#define HASH_SIZE 64 - -extern void compute_hash(char*, const char*); - -#endif //RELATIONAL_ENGINE_LIBRARY_H |
