added request sampler for prob model

dispatch_system/dispatch_daemon/config.json

-{"id":"192.168.31.51","master_node":"10.129.6.5"}
+{"id":"10.196.6.51","master_node":"10.129.6.5"}
\ No newline at end of file

dispatch_system/dispatch_manager/lib.js

@@ -47,10 +47,7 @@ function generateExecutor(functionPath, functionHash) {
  }
 
 function reverseProxy(req, res, functionToResource, resourceMap) {
-   if (req.headers["x-resource-id"]) {
-      branchChainPredictor(req, resourceMap)
-   }
-   
+   branchChainPredictor(req, resourceMap)
    return new Promise((resolve, reject) => {
       let runtime = req.body.runtime
       let id = req.params.id + runtime
@@ -144,33 +141,56 @@ function compare(a, b) {
 }
 
 function branchChainPredictor(req, resourceMap) {
-   let resource_id = req.headers['x-resource-id']
-   let resource = resourceMap.get(resource_id)
-   let forwardBranch = req.params.id
-   if (!functionBranchTree.has(resource.functionHash)) {
-      let data = {
-         req_count: 1,
-         branches: new Map()
+   console.log(req.headers['x-resource-id']);
+   
+   if (req.headers['x-resource-id'] === undefined) {
+      let functionHash = req.params.id
+      if (functionBranchTree.has(functionHash)) {
+         let branchInfo = functionBranchTree.get(functionHash)
+         branchInfo.req_count++
+
+      } else {
+         
+         let data = {
+            req_count: 1,
+            parent: true,
+            branches: new Map()
+         }
+         functionBranchTree.set(functionHash, data)
       }
-      data.branches.set(forwardBranch, 1)
-      functionBranchTree.set(resource.functionHash, data)
+      
    } else {
-      let branchInfo = functionBranchTree.get(resource.functionHash)
-      branchInfo.req_count++
-      if (branchInfo.branches.has(forwardBranch)) {
-         let branchProb = branchInfo.branches.get(forwardBranch)
-         branchProb = (branchProb * (branchInfo.req_count - 1) + 1.0)
-         branchInfo.branches.set(forwardBranch, branchProb)
+      let resource_id = req.headers['x-resource-id']
+      let resource = resourceMap.get(resource_id)
+      let forwardBranch = req.params.id
+      if (!functionBranchTree.has(resource.functionHash)) {
+         let data = {
+            req_count: 1,
+            parent: false,
+            branches: new Map()
+         }
+         data.branches.set(forwardBranch, 1)
+         functionBranchTree.set(resource.functionHash, data)
       } else {
-         branchInfo.branches.set(forwardBranch, 1.0)
-      }
-      for (let [branch, prob] of branchInfo.branches.entries()) {
-         if (branch !== forwardBranch)
-            prob *= (branchInfo.req_count - 1)
-         prob /= branchInfo.req_count
-         branchInfo.branches.set(branch, prob)
+         let branchInfo = functionBranchTree.get(resource.functionHash)
+         if (!branchInfo.parent)
+            branchInfo.req_count++
+         if (branchInfo.branches.has(forwardBranch)) {
+            let branchProb = branchInfo.branches.get(forwardBranch)
+            branchProb = (branchProb * (branchInfo.req_count - 1) + 1.0)
+            branchInfo.branches.set(forwardBranch, branchProb)
+         } else {
+            branchInfo.branches.set(forwardBranch, 1.0)
+         }
+         for (let [branch, prob] of branchInfo.branches.entries()) {
+            if (branch !== forwardBranch)
+               prob *= (branchInfo.req_count - 1)
+            prob /= branchInfo.req_count
+            branchInfo.branches.set(branch, prob)
+         }
       }
    }
+   
    console.log(functionBranchTree);   
 }
 

dispatch_system/dispatch_manager/repository/worker_env/node_modules/.bin/mime

-../mime/cli.js
\ No newline at end of file

dispatch_system/dispatch_manager/repository/worker_env/node_modules/.bin/mime

+#!/usr/bin/env node
+
+var mime = require('./mime.js');
+var file = process.argv[2];
+var type = mime.lookup(file);
+
+process.stdout.write(type + '\n');
+

cJSON @ f790e17b

+Subproject commit f790e17b6cecef030c4eda811149d238c2085fcf

nlib @ 75bc1a11

+Subproject commit 75bc1a11e2a10cf249f566b40c85d6526c16f123