commit before 3.6.8

haved · haved · commit 8acd64046c8c · 2020-09-10T12:33:43.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.o
+old/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM  ubuntu:18.04
+
+WORKDIR /queue
+
+RUN apt-get update \
+ && apt-get install --yes python3 \
+ && mkdir -p /queue
+
diff --git a/oldpython.sh b/oldpython.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+#docker image build -t oldpython:1.0 .
+docker run -ti --mount type=bind,src="$(pwd)",dst=/queue oldpython:1.0 /bin/bash
diff --git a/queue.py b/queue.py
@@ -22,25 +22,17 @@
 setCallAddress_type = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.py_object, ctypes.c_void_p)
 setCallAddress = ctypes.cast(code_address+0x20, setCallAddress_type)
 
-print("code address:", hex(code_address))
-
-def make_superqu(x):
-    print("Hei")
+def make_superqu():
+    pass
 def superenqu(x):
-    print("uff")
+    pass
 def superdequ():
-    print("fak")
+    pass
 
 setCallAddress(make_superqu, code_address+0x60)
 setCallAddress(superenqu, code_address+0xe0)
 setCallAddress(superdequ, code_address+0x1a0)
 
-def getDataAt(offset):
-    ptr = ctypes.cast(code_address+0x400+offset, ctypes.POINTER(ctypes.c_size_t))
-    value = ptr.contents.value
-    print("woah================================" + hex(value))
-
-
 class Queue():
     def __init__(self, max_size):
         ctypes.memmove(code_address+0x400+16, max_size.to_bytes(8, 'little'), 8)
@@ -54,10 +46,19 @@ def dequeue(self):
 
 highscore = False
 
-q = Queue(64)
-q.enqueue(7)
-q.enqueue(10)
-print(q.dequeue())
-q.enqueue(13)
-print(q.dequeue())
-print(q.dequeue())
+q = Queue(3)
+
+liste = [1, 7, 3]
+ops = [True, False, True, False, True, False]
+
+ut = []
+
+index = 0
+for op in ops:
+    if op:
+        q.enqueue(liste[index])
+        index += 1
+    else:
+        ut.append(q.dequeue())
+
+print(liste == ut)
diff --git a/readme.md b/readme.md
@@ -0,0 +1,30 @@
+
+# My attempt to make a queue in C and inject it into python
+The c code is compiled into a byte object that python then places into an
+exectuable and writeable mmapped block.
+
+The c code is not linked, so can not use any external functions.
+It can however use the Python.h header for macros and struct field offsets.
+
+It defines a few functions, compiles it and copies the `.text` section
+to a python bytes object. I have to use objdump to manually
+see the offsets each function exists at.
+
+Note: ctypes is only used for initial calls to C, which will then
+change the function pointers associated with python functions.
+
+This is all to try and get a good time on the INGInious scoreboard in TDT4120.
+
+The version of python is different, so I compile my own from the cpython repository to test.
+
+Python version on server:
+```
+import sys
+
+ver = sys.version_info
+assert ver.major == 3
+assert ver.minor == 6
+assert ver.micro == 8
+```
+
+ubuntu:18.04 docker image has `python3` package at `3.6.9`, which hopefully lets me test on a "different machine".

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/usr/bin/bash`
	`2`	`+#docker image build -t oldpython:1.0 .`
	`3`	`+docker run -ti --mount type=bind,src="$(pwd)",dst=/queue oldpython:1.0 /bin/bash`