Enable storing member fields

Author: pmenon

src/codegen/codegen.cpp

@@ -6,7 +6,7 @@
 //
 // Identification: src/codegen/codegen.cpp
 //
-// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -294,16 +294,26 @@ uint64_t CodeGen::ElementOffset(llvm::Type *type, uint32_t element_idx) const {
 
 ////////////////////////////////////////////////////////////////////////////////
 ///
-/// CPP Proxy Compiled Member
+/// Proxy Member
 ///
 ////////////////////////////////////////////////////////////////////////////////
 
-llvm::Value *CppProxyMember::Load(CodeGen &codegen, llvm::Value *ptr) const {
+llvm::Value *CppProxyMember::Load(CodeGen &codegen,
+                                  llvm::Value *obj_ptr) const {
   llvm::SmallVector<llvm::Value *, 2> indexes = {codegen.Const32(0),
-                                                 codegen.Const32(slot)};
-  llvm::Value *addr = codegen->CreateInBoundsGEP(ptr, indexes);
+                                                 codegen.Const32(slot_)};
+  // TODO(pmenon): Use CreateStructGEP()
+  llvm::Value *addr = codegen->CreateInBoundsGEP(obj_ptr, indexes);
   return codegen->CreateLoad(addr);
 }
 
+void CppProxyMember::Store(CodeGen &codegen, llvm::Value *obj_ptr,
+                           llvm::Value *val) const {
+  llvm::SmallVector<llvm::Value *, 2> indexes = {codegen.Const32(0),
+                                                 codegen.Const32(slot_)};
+  llvm::Value *addr = codegen->CreateInBoundsGEP(obj_ptr, indexes);
+  codegen->CreateStore(val, addr);
+}
+
 }  // namespace codegen
 }  // namespace peloton

src/include/codegen/codegen.h

@@ -6,7 +6,7 @@
 //
 // Identification: src/include/codegen/codegen.h
 //
-// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,16 +20,42 @@
 namespace peloton {
 namespace codegen {
 
-/// A proxy to a member of a class. Users must provide both the physical
-/// position of the member in the class, and the C++ type of the member.
+// Forward declare
 class CodeGen;
 
-struct CppProxyMember {
-  uint32_t slot;
-
-  explicit CppProxyMember(uint32_t _slot) noexcept : slot(_slot) {}
+/**
+ * A CppProxyMember defines an access proxy to a member defined in a C++ class.
+ * Users can use this class to generate code to load values from and store
+ * values into member variables of C++ classes/structs available at runtime.
+ * Each member is defined by a slot position in the C++ struct. Slots are
+ * zero-based ordinal numbers assigned to fields increasing order of appearance
+ * in the struct/class.
+ */
+class CppProxyMember {
+ public:
+  explicit CppProxyMember(uint32_t slot) noexcept : slot_(slot) {}
+
+  /**
+   * Load this member field from the provided struct pointer.
+   *
+   * @param codegen The codegen instance
+   * @param obj_ptr A pointer to a runtime C++ struct
+   * @return The value of the field
+   */
+  llvm::Value *Load(CodeGen &codegen, llvm::Value *obj_ptr) const;
+
+  /**
+   * Store the provided value into this member field of the provided struct.
+   *
+   * @param codegen The codegen instance
+   * @param obj_ptr A pointer to a runtime C++ struct
+   * @param val The value of the field
+   */
+  void Store(CodeGen &codegen, llvm::Value *obj_ptr, llvm::Value *val) const;
 
-  llvm::Value *Load(CodeGen &codegen, llvm::Value *ptr) const;
+ private:
+  // The slot position
+  uint32_t slot_;
 };
 
 //===----------------------------------------------------------------------===//
@@ -90,8 +116,13 @@ class CodeGen {
   }
 
   template <typename T>
-  llvm::Value *Load(const T &loader, llvm::Value *ptr) {
-    return loader.Load(*this, ptr);
+  llvm::Value *Load(const T &loader, llvm::Value *obj_ptr) {
+    return loader.Load(*this, obj_ptr);
+  }
+
+  template <typename T>
+  void Store(const T &storer, llvm::Value *obj_ptr, llvm::Value *val) {
+    storer.Store(*this, obj_ptr, val);
   }
 
   //===--------------------------------------------------------------------===//

src/include/threadpool/worker_pool.h

@@ -12,7 +12,10 @@
 
 #pragma once
 
+#include <atomic>
 #include <functional>
+#include <string>
+#include <thread>
 #include <vector>
 
 #include "common/container/lock_free_queue.h"