More work on test cases

Author: libumem

examples/src/linux/Makefile

@@ -37,6 +37,8 @@ TARGETS =					\
 	x8664_onestraw_server		\
 	x8664_epoll_0			\
 	x8664_linux_utime		\
+	x8664_onestraw_server		\
+	x8664_epoll_0			\
 	patch_test.bin
 
 .PHONY: all clean
@@ -131,6 +133,10 @@ x8664_linux_utime: x8664_linux_utime.c
 	$(CC) $(CPPFLAGS) $(CFLAGS)  -m64 -o $@ $<
 x86_linux_utime: x8664_linux_utime.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -m32 -o x86_linux_utime $<
+x8664_epoll_0: x8664_epoll_0.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m64 -static -o $@ $<
+x8664_onestraw_server: x8664_onestraw_server.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -m64 -static -o $@ $<
 
 
 libpatch_test.so: patch_test.so.h patch_test.so.c

qiling/os/posix/syscall/epoll.py

@@ -65,9 +65,13 @@ def is_present(self, fd):
 fds for an instance of epoll being watched.
 If a chain of over 5 levels is detected, return
 1, which will return ELOOP in ql_syscall_epoll_wait
+<<<<<<< HEAD
 """
 
 
+=======
+'''
+>>>>>>> 342d61da (More work on test cases)
 def check_epoll_depth(ql_fd_list, epolls_list, depth):
     if depth == 7:
 =======
@@ -92,6 +96,7 @@ def check_epoll_depth(ql_fd_list, epolls_list, depth):
 """
 Modify an existing epoll
 man 7 epoll for more details
+<<<<<<< HEAD
 """
 
 
@@ -101,6 +106,10 @@ def ql_syscall_epoll_ctl(
 =======
 def ql_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER):
 >>>>>>> 0aef533c (Initial commit for epoll)
+=======
+'''
+def ql_syscall_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER):
+>>>>>>> 342d61da (More work on test cases)
     # Basic sanity checks first
     if event != 0:
         ql_event = ql.unpack32(ql.mem.read(event, 4))  # events list is uint32_t
@@ -157,6 +166,7 @@ def ql_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER)
     if epoll_obj is None or fd_obj is None:
         # epfd or fd is not a valid file descriptor.
         return EBADF
+<<<<<<< HEAD
 <<<<<<< HEAD
     if epfd == fd:  # epoll can't monitor itself
         return EINVAL
@@ -193,6 +203,9 @@ def ql_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER)
         epoll_parent_obj.set_eventmask(ql_event)
 =======
     if epfd == fd:
+=======
+    if epfd == fd: # epoll can't monitor itself
+>>>>>>> 342d61da (More work on test cases)
         return EINVAL
     if epoll_obj.fileno() == fd:
         return ELOOP  # ELOOP  ...or a nesting depth of epoll instances greater than 5.
@@ -202,6 +215,7 @@ def ql_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER)
                 fd
             ):  # can't add an fd that's already being waited on
                 return EEXIST  # op was EPOLL_CTL_ADD, and the supplied file descriptor fd is already registered with this epoll instance.
+            
             epoll_parent_obj.monitor_fd(
                 fd, ql_event
             )  # add to list of fds to be monitored with per-fd eventmask
@@ -232,13 +246,18 @@ def ql_epoll_ctl(ql: qiling.Qiling, epfd: int, op: int, fd: int, event: POINTER)
 """
 Wait on an existing epoll for events specified
 earlier. man 7 epoll_wait for more info
+<<<<<<< HEAD
 """
 
 
 def ql_syscall_epoll_wait(
 =======
 def ql_epoll_wait(
 >>>>>>> 0aef533c (Initial commit for epoll)
+=======
+'''
+def ql_syscall_epoll_wait(
+>>>>>>> 342d61da (More work on test cases)
     ql: qiling.Qiling, epfd: int, epoll_events: POINTER, maxevents: int, timeout: int
 ):
     if maxevents <= 0:
@@ -289,13 +308,17 @@ def ql_epoll_wait(
 Use select.epoll for underlying implementation,
 just as select.poll is used for emulating poll()
 """
+<<<<<<< HEAD
 
 
 <<<<<<< HEAD
 def ql_syscall_epoll_create1(ql: qiling.Qiling, flags: int):
 =======
 def ql_epoll_create1(ql: qiling.Qiling, flags: int):
 >>>>>>> 0aef533c (Initial commit for epoll)
+=======
+def ql_syscall_epoll_create1(ql: qiling.Qiling, flags: int):
+>>>>>>> 342d61da (More work on test cases)
     if flags != select.EPOLL_CLOEXEC and flags != 0:
         return EINVAL
     ret = select.epoll(sizehint=-1, flags=flags)
@@ -310,6 +333,7 @@ def ql_epoll_create1(ql: qiling.Qiling, flags: int):
 <<<<<<< HEAD
 because of the slightly different prototype
 """
+<<<<<<< HEAD
 
 
 def ql_syscall_epoll_create(ql: qiling.Qiling, size: int):
@@ -321,6 +345,9 @@ def ql_syscall_epoll_create(ql: qiling.Qiling, size: int):
 
 def ql_epoll_create(ql: qiling.Qiling, size: int):
 >>>>>>> 0aef533c (Initial commit for epoll)
+=======
+def ql_syscall_epoll_create(ql: qiling.Qiling, size: int):
+>>>>>>> 342d61da (More work on test cases)
     if size < 0:
         return EINVAL
     ret = select.epoll(sizehint=size, flags=0)

tests/test_elf.py

@@ -772,6 +772,8 @@ def test_elf_linux_x8664_path_traversion(self):
 
         del ql
     @unittest.skip('postpone until further discussion')
+
+    @unittest.skip("hangs, possibly bc of newfstatat?")
     def test_elf_linux_x8664_epoll_simple(self):
         def hook_newfstatat(ql: Qiling, dirfd: int, path: int, buf: int, flags: int):
             return 1
@@ -795,6 +797,7 @@ def hook_newfstatat(ql: Qiling, dirfd: int, path: int, buf: int, flags: int):
         self.assertIn("echo", ql.os.stdout.read(10).decode("utf-8"))
         del ql
     @unittest.skip('remove until rootfs is added, more discussion too')
+
     def test_elf_linux_x8664_epoll_server(self):
         def hook_newfstatat(ql: Qiling, dirfd: int, path: int, buf: int, flags: int):
             return 1
@@ -804,6 +807,23 @@ def client():
             conn = http.client.HTTPConnection('localhost', 8000, timeout=10)
             conn.request('GET', '/')
             conn.close()
+            '''
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            dest = ("localhost", 8000)
+            try:
+                s.connect(dest)
+            except Exception as e:
+                ql.log.debug(
+                    "socket.connect() failed in test_elf_linux_x8664_epoll_server"
+                )
+                ql.log.debug(e)
+            test = b"hello world"
+            s.send(test)
+            s.close()
+            '''
+            conn = http.client.HTTPConnection('localhost', 8000, timeout=10)
+            conn.request('GET', '/')
+
         # use threads here to test how the server
         # handles the request
         client_thread = threading.Thread(target=client, daemon=True)
@@ -815,6 +835,7 @@ def client():
 
         ql = Qiling(argv, rootfs, multithread=False, verbose=QL_VERBOSE.DEBUG)
         ql.os.stdout = pipe.SimpleOutStream(1)  # server prints data received to stdout
+        
         ql.os.set_syscall(
             "newfstatat", hook_newfstatat, QL_INTERCEPT.CALL
         )  # workaround for issue ENOENT issue in prior test case