Merge branch 'main' into codex/rename-function-parameters-in-pg_os-1.0.sql

Author: seanwevans

Makefile

@@ -1,7 +1,7 @@
 EXTENSION = pg_os
 DATA = pg_os--1.0.sql
 PG_CONFIG ?= pg_config
-REGRESS = pg_os_basic create_user lock_file create_process allocate_memory load_unload_module modules check_permission
+REGRESS = pg_os_basic create_user lock_file create_process allocate_memory load_unload_module modules check_permission free_all_memory_for_process
 REGRESS_OPTS = --outputdir=/tmp/pg_os_regress
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

expected/free_all_memory_for_process.out

@@ -0,0 +1,22 @@
+-- test for free_all_memory_for_process
+\set ECHO none
+SELECT free_all_memory_for_process(1);
+ free_all_memory_for_process 
+-----------------------------
+ 
+(1 row)
+
+SELECT id, allocated, allocated_to FROM memory_segments ORDER BY id;
+ id | allocated | allocated_to 
+----+-----------+--------------
+  1 | f         |             
+  2 | f         |             
+  3 | t         |            2
+(3 rows)
+
+SELECT process_id, segment_id FROM process_memory ORDER BY process_id, segment_id;
+ process_id | segment_id 
+------------+------------
+          2 |          3
+(1 row)
+

pg_os--1.0.sql

@@ -601,7 +601,7 @@ CREATE OR REPLACE FUNCTION handle_signals(user_id INTEGER, process_id INTEGER) R
 DECLARE
     sig RECORD;
 BEGIN
-    FOR sig IN SELECT * FROM signals WHERE process_id = process_id LOOP
+    FOR sig IN SELECT * FROM signals WHERE process_id = handle_signals.process_id LOOP
         IF sig.signal_type = 'SIGTERM' THEN
             PERFORM terminate_process(user_id, process_id);
         ELSIF sig.signal_type = 'SIGSTOP' THEN
@@ -1121,9 +1121,18 @@ CREATE OR REPLACE FUNCTION free_all_memory_for_process(process_id INTEGER) RETUR
 DECLARE
     seg_id INTEGER;
 BEGIN
-    FOR seg_id IN SELECT segment_id FROM process_memory WHERE process_id = process_id LOOP
-        UPDATE memory_segments SET allocated = FALSE, allocated_to = NULL WHERE id = seg_id;
-        DELETE FROM process_memory WHERE process_id = process_id AND segment_id = seg_id;
+    FOR seg_id IN
+        SELECT segment_id
+          FROM process_memory
+         WHERE process_memory.process_id = free_all_memory_for_process.process_id
+    LOOP
+        UPDATE memory_segments
+           SET allocated = FALSE,
+               allocated_to = NULL
+         WHERE id = seg_id;
+        DELETE FROM process_memory
+         WHERE process_memory.process_id = free_all_memory_for_process.process_id
+           AND segment_id = seg_id;
     END LOOP;
 END;
 $$ LANGUAGE plpgsql;

signals.sql

@@ -26,7 +26,7 @@ CREATE OR REPLACE FUNCTION handle_signals(user_id INTEGER, process_id INTEGER) R
 DECLARE
     sig RECORD;
 BEGIN
-    FOR sig IN SELECT * FROM signals WHERE process_id = process_id LOOP
+    FOR sig IN SELECT * FROM signals WHERE process_id = handle_signals.process_id LOOP
         IF sig.signal_type = 'SIGTERM' THEN
             PERFORM terminate_process(user_id, process_id);
         ELSIF sig.signal_type = 'SIGSTOP' THEN

sql/free_all_memory_for_process.sql

@@ -0,0 +1,61 @@
+-- test for free_all_memory_for_process
+\set ECHO none
+SET client_min_messages TO warning;
+
+-- minimal tables
+DROP TABLE IF EXISTS memory_segments CASCADE;
+DROP TABLE IF EXISTS process_memory CASCADE;
+CREATE TABLE memory_segments (
+    id SERIAL PRIMARY KEY,
+    size INTEGER NOT NULL,
+    allocated BOOLEAN DEFAULT FALSE,
+    allocated_to INTEGER
+);
+
+CREATE TABLE process_memory (
+    process_id INTEGER,
+    segment_id INTEGER,
+    PRIMARY KEY (process_id, segment_id)
+);
+
+-- function under test
+CREATE OR REPLACE FUNCTION free_all_memory_for_process(process_id INTEGER) RETURNS VOID AS $$
+DECLARE
+    seg_id INTEGER;
+BEGIN
+    FOR seg_id IN
+        SELECT segment_id
+          FROM process_memory
+         WHERE process_memory.process_id = free_all_memory_for_process.process_id
+    LOOP
+        UPDATE memory_segments
+           SET allocated = FALSE,
+               allocated_to = NULL
+         WHERE id = seg_id;
+        DELETE FROM process_memory
+         WHERE process_memory.process_id = free_all_memory_for_process.process_id
+           AND segment_id = seg_id;
+    END LOOP;
+END;
+$$ LANGUAGE plpgsql;
+
+-- allocate memory to processes 1 and 2
+INSERT INTO memory_segments(size, allocated, allocated_to) VALUES
+    (100, TRUE, 1),
+    (100, TRUE, 1),
+    (100, TRUE, 2);
+
+INSERT INTO process_memory(process_id, segment_id) VALUES
+    (1, 1),
+    (1, 2),
+    (2, 3);
+
+\set ECHO queries
+\set VERBOSITY terse
+
+-- free all memory for process 1
+SELECT free_all_memory_for_process(1);
+
+-- inspect results
+SELECT id, allocated, allocated_to FROM memory_segments ORDER BY id;
+SELECT process_id, segment_id FROM process_memory ORDER BY process_id, segment_id;