[orbis-kernel] Event flag fixes

RPCSX · Jul 17, 2023 · 00690fd · 00690fd
1 parent e9ffa97
commit 00690fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/orbis-kernel/include/orbis/KernelContext.hpp b/orbis-kernel/include/orbis/KernelContext.hpp
@@ -65,6 +65,7 @@ class alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) KernelContext final {
     auto [it, inserted] = m_event_flags.try_emplace(std::move(name), nullptr);
     if (inserted) {
       it->second = knew<EventFlag>(flags, initPattern);
+      std::strncpy(it->second->name, it->first.c_str(), 32);
     }
 
     return {it->second.get(), inserted};
@@ -106,7 +107,6 @@ class alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) KernelContext final {
   }
 
 private:
-  shared_mutex m_evf_mtx;
   mutable pthread_mutex_t m_heap_mtx;
   void *m_heap_next = this + 1;
   bool m_heap_is_freeing = false;
@@ -119,6 +119,8 @@ class alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) KernelContext final {
 
   mutable shared_mutex m_proc_mtx;
   utils::LinkedNode<Process> *m_processes = nullptr;
+
+  shared_mutex m_evf_mtx;
   utils::kmap<utils::kstring, Ref<EventFlag>> m_event_flags;
 };
 

diff --git a/orbis-kernel/src/sys/sys_sce.cpp b/orbis-kernel/src/sys/sys_sce.cpp
@@ -94,19 +94,21 @@ orbis::SysResult orbis::sys_evf_create(Thread *thread, ptr<const char[32]> name,
   }
 
   switch (attrs & (kEvfAttrSingle | kEvfAttrMulti)) {
-  case 0:
   case kEvfAttrSingle | kEvfAttrMulti:
-    attrs = (attrs & ~(kEvfAttrSingle | kEvfAttrMulti)) | kEvfAttrSingle;
+    return ErrorCode::INVAL;
+  case 0:
+    attrs |= kEvfAttrSingle;
     break;
 
   default:
     break;
   }
 
   switch (attrs & (kEvfAttrThPrio | kEvfAttrThFifo)) {
-  case 0:
   case kEvfAttrThPrio | kEvfAttrThFifo:
-    attrs = (attrs & ~(kEvfAttrThPrio | kEvfAttrThFifo)) | kEvfAttrThFifo;
+    return ErrorCode::INVAL;
+  case 0:
+    attrs |= kEvfAttrThFifo;
     break;
 
   default:
@@ -131,6 +133,7 @@ orbis::SysResult orbis::sys_evf_create(Thread *thread, ptr<const char[32]> name,
     eventFlag = insertedEvf;
   } else {
     eventFlag = knew<EventFlag>(attrs, initPattern);
+    std::strncpy(eventFlag->name, _name, 32);
   }
 
   thread->retval[0] = thread->tproc->evfMap.insert(eventFlag);
@@ -162,7 +165,6 @@ orbis::SysResult orbis::sys_evf_open(Thread *thread, ptr<const char[32]> name) {
     return ErrorCode::SRCH;
   }
 
-  std::strcpy(eventFlag->name, _name);
   thread->retval[0] = thread->tproc->evfMap.insert(eventFlag);
   return {};
 }