From 291a603c0d4f85f1316c6260741738ec33f1df25 Mon Sep 17 00:00:00 2001 From: arshiam2 <arshiam2@illinois.edu> Date: Sun, 7 Oct 2018 23:00:05 -0500 Subject: [PATCH] cleanup --- inroducer/.dockerignore | 4 - inroducer/.gitignore | 1 - inroducer/Dockerfile | 13 --- inroducer/index.js | 157 ------------------------------------ inroducer/package-lock.json | 13 --- inroducer/package.json | 15 ---- inroducer/yarn.lock | 7 -- machine/netbps | 24 ------ machine/yarn.lock | 7 -- 9 files changed, 241 deletions(-) delete mode 100644 inroducer/.dockerignore delete mode 100644 inroducer/.gitignore delete mode 100644 inroducer/Dockerfile delete mode 100644 inroducer/index.js delete mode 100644 inroducer/package-lock.json delete mode 100644 inroducer/package.json delete mode 100644 inroducer/yarn.lock delete mode 100755 machine/netbps delete mode 100644 machine/yarn.lock diff --git a/inroducer/.dockerignore b/inroducer/.dockerignore deleted file mode 100644 index c0ff3ac..0000000 --- a/inroducer/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!index.js -!package.json -!yarn.lock \ No newline at end of file diff --git a/inroducer/.gitignore b/inroducer/.gitignore deleted file mode 100644 index b512c09..0000000 --- a/inroducer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/inroducer/Dockerfile b/inroducer/Dockerfile deleted file mode 100644 index 093a085..0000000 --- a/inroducer/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM mhart/alpine-node:10 as base -WORKDIR /usr/src -COPY package.json yarn.lock ./ -RUN yarn --production - -FROM mhart/alpine-node:base-10 -WORKDIR /usr/src -COPY --from=base /usr/src . -COPY . . -CMD node index.js - -EXPOSE 20000:20000/udp -EXPOSE 20000 diff --git a/inroducer/index.js b/inroducer/index.js deleted file mode 100644 index 751d847..0000000 --- a/inroducer/index.js +++ /dev/null @@ -1,157 +0,0 @@ -const PORT = 20000; -const MULTICAST_ADDR = "233.255.255.255"; - -const dgram = require("dgram"); -const process = require("process"); -var ip = require("ip"); - -const socket = dgram.createSocket({ type: "udp4", reuseAddr: true }); - -const CLI_HOST = "172.16.138.158"; - -const CLI_PORT = "5000"; - -socket.bind(PORT); - -let connections = {}; - -let machines = ["2" + Date.now(), "3" + Date.now()]; - -const machineToIps = { - "0": "172.16.138.158", - "1": "172.22.156.15", - "2": "172.22.158.15", - "3": "172.22.154.16", - "4": "172.22.156.16", - "5": "172.22.158.16", - "6": "172.22.154.17", - "8": "172.22.158.17", - "9": "172.22.154.18", - "10": "172.22.156.18" -}; - -const IpsToMachine = { - "0.0.0.0": "0", - "172.16.138.158": "0", - "172.22.156.15": "1", - "172.22.158.15": "2", - "172.22.154.16": "3", - "172.22.156.16": "4", - "172.22.158.16": "5", - "172.22.154.17": "6", - "172.22.158.17": "8", - "172.22.154.18": "9", - "172.22.156.18": "10" -}; - -let machineNumber = IpsToMachine[ip.address()]; - -socket.on("listening", function() { - socket.addMembership(MULTICAST_ADDR); - socket.setBroadcast(true); - const address = socket.address(); - console.log( - `UDP socket listening on ${address.address}:${address.port} pid: ${ - process.pid - } machine ${machineNumber}` - ); -}); - -function syn(machineNumberBeingChecked) { - console.log(machineNumberBeingChecked); - console.log("my machien number" + machineNumber); - const message = Buffer.from(`check ${machineToIps[machineNumber]}`); - socket.send( - message, - 0, - message.length, - PORT, - machineToIps[machineNumberBeingChecked], - function() {} - ); -} - -function initialize(machineNumber, connectedTo) { - const message = Buffer.from(`initialize [${connectedTo}]`); - socket.send( - message, - 0, - message.length, - PORT, - machineToIps[machineNumber], - function() {} - ); -} - -function getPairings(machines) { - for (let i = 0; i < machines.length; i++) { - surroundingNodes = []; - - if (i + 1 > machines.length - 1) { - surroundingNodes.push(machines[i + 1 - machines.length]); - } else { - surroundingNodes.push(machines[i + 1]); - } - - if (i + 2 > machines.length - 1) { - surroundingNodes.push(machines[i + 2 - machines.length]); - } else { - surroundingNodes.push(machines[i + 2]); - } - - if (i - 1 < 0) { - surroundingNodes.push(machines[i - 1 + machines.length]); - } else { - surroundingNodes.push(machines[i - 1]); - } - - if (i - 2 < 0) { - surroundingNodes.push(machines[i - 2 + machines.length]); - } else { - surroundingNodes.push(machines[i - 2]); - } - - // console.log( - // "Node :" + - // machines[i] + - // " is connect to " + - // Array.from(new Set(surroundingNodes)) - // ); - initialize(machines[i][0], Array.from(new Set(surroundingNodes))); - } -} - -socket.on("message", function(message, rinfo) { - const text = message.toString().split(" "); - if (text[0] === "init") { - // console.log("GOT INIR"); - getPairings(machines); - } - if (text[0] === "join") { - if ( - machines - .map(m => m.toString()[0]) - .filter(f => f === text[1].toString()[0]).length == 0 - ) { - machines.push(text[1]); - console.log(machines); - getPairings(machines); - } else { - ("This machine has already joined"); - } - } - - if (text[0] === "leave") { - machines = machines.filter(m => m.toString()[0] !== text[1]); - getPairings(machines); - } - - if (text[0] === "dead") { - console.log("Killed " + text[1].toString()[0]) - const ondLength = machines.length - machines = machines.filter(m => m.toString()[0] !== text[1].toString()[0]); - console.log(machines) - getPairings(machines); - - } -}); diff --git a/inroducer/package-lock.json b/inroducer/package-lock.json deleted file mode 100644 index fd52091..0000000 --- a/inroducer/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "introducer", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "dgram": { - "version": "1.0.1", - "resolved": "http://registry.npmjs.org/dgram/-/dgram-1.0.1.tgz", - "integrity": "sha1-N/OyAPgDOl/3WTAwicgc42G2UcM=" - } - } -} diff --git a/inroducer/package.json b/inroducer/package.json deleted file mode 100644 index ce95c88..0000000 --- a/inroducer/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "introducer", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "start": "node index.js", - "test": "node test.js" - }, - "author": "Aria <arshiam2828@gmail.com>", - "license": "MIT", - "dependencies": { - "dgram": "^1.0.1" - } -} diff --git a/inroducer/yarn.lock b/inroducer/yarn.lock deleted file mode 100644 index 3065670..0000000 --- a/inroducer/yarn.lock +++ /dev/null @@ -1,7 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -dgram@^1.0.1: - version "1.0.1" - resolved "http://registry.npmjs.org/dgram/-/dgram-1.0.1.tgz#37f3b200f8033a5ff759303089c81ce361b651c3" diff --git a/machine/netbps b/machine/netbps deleted file mode 100755 index b5520c8..0000000 --- a/machine/netbps +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; -use Time::HiRes; - -my $reporting_interval = 10.0; # seconds -my $bytes_this_interval = 0; -my $start_time = [Time::HiRes::gettimeofday()]; - -STDOUT->autoflush(1); - -while (<>) { - if (/ length (\d+):/) { - $bytes_this_interval += $1; - my $elapsed_seconds = Time::HiRes::tv_interval($start_time); - if ($elapsed_seconds > $reporting_interval) { - my $bps = $bytes_this_interval / $elapsed_seconds; - printf "%02d:%02d:%02d %10.2f Bps\n", (localtime())[2,1,0],$bps; - $start_time = [Time::HiRes::gettimeofday()]; - $bytes_this_interval = 0; - } - } -} - diff --git a/machine/yarn.lock b/machine/yarn.lock deleted file mode 100644 index 227e695..0000000 --- a/machine/yarn.lock +++ /dev/null @@ -1,7 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -dgram@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/dgram/-/dgram-1.0.1.tgz#37f3b200f8033a5ff759303089c81ce361b651c3" -- GitLab