From 7f9ebf06c021b26a9e1b52da91241bf461d80ecc Mon Sep 17 00:00:00 2001
From: William R Reid <william.reid@uconn.edu>
Date: Sun, 27 Jan 2019 23:24:12 -0500
Subject: [PATCH] Revert "Merge simple-server into master"

---
 .gitignore               |   2 -
 README.md                | Bin 6352 -> 42 bytes
 data-types/data-types.go |  15 ----
 hello.go                 |   9 +++
 sender/sender.go         | 161 ---------------------------------------
 5 files changed, 9 insertions(+), 178 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 data-types/data-types.go
 create mode 100644 hello.go
 delete mode 100644 sender/sender.go

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 981ef2d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea/*
-*.exe
\ No newline at end of file
diff --git a/README.md b/README.md
index d9ddb17c24fe2682b0363cc329a472a559c6c3bc..863462b85441d6dc9406d334cc0e10e5eda013c4 100644
GIT binary patch
delta 18
Zcmca$sKxsKpE85O<Yoay7G4G}1^_*81k(Tj

literal 6352
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

diff --git a/data-types/data-types.go b/data-types/data-types.go
deleted file mode 100644
index 5f0982a..0000000
--- a/data-types/data-types.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package data_types
-
-// This file contains data types that are shared between the sender and the responder you will write.
-
-// Struct to manage responses we get
-type ResponseStruct struct {
-	ID int `json:"id"`
-}
-
-// Struct to manage data we're sending
-type DataStruct struct {
-	ID       int `json:"id"`
-	Duration int `json:"duration"`
-	Stamp    int `json:"stamp"`
-}
diff --git a/hello.go b/hello.go
new file mode 100644
index 0000000..17957ee
--- /dev/null
+++ b/hello.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Printf("hello, world\n")
+}
diff --git a/sender/sender.go b/sender/sender.go
deleted file mode 100644
index d4e4fd2..0000000
--- a/sender/sender.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"generator-server/data-types"
-	"github.com/gorilla/websocket"
-	"math/rand"
-	"strconv"
-	"sync"
-	"time"
-)
-
-/* This file tries to make a websocket connection to your server, and then sends it 100 messages at varying intervals
- * that request a response after a certain duration. Your server will read the messages, wait that amount of time,
- * and then send a message back with the IDs of the messages it has waited for.
- */
-
-var globalwait sync.WaitGroup
-
-func main() {
-	// Initialize the waitgroup that will keep this running until the senders are done
-	globalwait = sync.WaitGroup{}
-
-	// Create and start some senders
-	for i := 0; i < 5; i++ {
-		// Try to get a websocket connection
-		c, _, err := websocket.DefaultDialer.Dial("ws://localhost:3000/v1/ws", nil)
-		if err != nil {
-			fmt.Println(err.Error())
-			return
-		}
-
-		// Name the senders 0-4
-		sender := NewSender(strconv.Itoa(i), c)
-		sender.run()
-		time.Sleep(3 * time.Second)
-
-	}
-
-	// Wait on the waitgroup
-	globalwait.Wait()
-}
-
-// Struct to manage our data senders
-type sender struct {
-	name  string
-	conn  *websocket.Conn
-	lock  sync.RWMutex
-	check *checker
-}
-
-// Initialize and return a sender
-func NewSender(n string, conn *websocket.Conn) *sender {
-	return &sender{name: n, conn: conn, lock: sync.RWMutex{}, check: NewChecker()}
-}
-
-// Wrapper around the async run routine that tells globalwait there's something going on and starts the sender
-func (s *sender) run() {
-	globalwait.Add(1)
-	go s._run()
-}
-
-// main sender routine
-func (s *sender) _run() {
-
-	// Need to wait on checker, then close the connection and tell globalwait we're done
-	defer func() {
-		s.check.wg.Wait()
-		s.conn.WriteMessage(websocket.CloseMessage, nil)
-		s.conn.Close()
-		globalwait.Done()
-	}()
-
-	// Start the listener for this sender
-	go s.listen()
-
-	// Change the seed so we don't get the same thing every time
-	rand.Seed(int64(time.Now().Unix()))
-
-	// Loop and send packets
-	for i := 0; i < 100; i++ {
-		// Get a random duration
-		d := rand.Intn(3)
-
-		// Send ID, duration, timestamp
-		ds := &data_types.DataStruct{ID: i, Duration: d, Stamp: int(time.Now().Unix())}
-
-		// Tell the sender to send the packet
-		go s.send(ds)
-
-		// Wait a random amount of time
-		time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond)
-	}
-}
-
-// Main thread for listening for responses
-func (s *sender) listen() {
-
-	// initialize a response struct to unpack response into
-	var r data_types.ResponseStruct
-
-	// while loop -- repeat indefinitely
-	for {
-		err := s.conn.ReadJSON(&r)
-		if err != nil {
-			if websocket.IsUnexpectedCloseError(err) {
-				fmt.Printf("Sender %v lost reading connection: %v\n", s.name, err.Error())
-			}
-			break
-		}
-
-		// Tell the checker we got a response
-		s.received(r.ID)
-	}
-}
-
-// type for our response checking management
-type checker struct {
-	m    map[int]*data_types.DataStruct
-	lock sync.RWMutex
-	wg   sync.WaitGroup
-}
-
-// Method to get a new, empty checker
-func NewChecker() *checker {
-	return &checker{m: make(map[int]*data_types.DataStruct), lock: sync.RWMutex{}, wg: sync.WaitGroup{}}
-}
-
-// Tell the checker we sent something
-func (s *sender) send(ds *data_types.DataStruct) {
-
-	// Add to wait group
-	s.check.wg.Add(1)
-
-	// Send the message, lock to be safe
-	s.lock.Lock()
-	if err := s.conn.WriteJSON(ds); err != nil {
-		fmt.Printf("Sender %v error writing: %v", s.name, err.Error())
-	}
-	s.lock.Unlock()
-
-	// Add to checker map, lock to be safe
-	s.check.lock.Lock()
-	s.check.m[ds.ID] = ds
-	s.check.lock.Unlock()
-}
-
-// Tell the checker we got something
-func (s *sender) received(i int) {
-
-	// Grab the data entry and then delete it, locking for safe map access
-	s.check.lock.Lock()
-	ds := s.check.m[i]
-	delete(s.check.m, i)
-	s.check.lock.Unlock()
-	s.check.wg.Done()
-
-	// Check how long ago we sent this
-	diff := int(time.Now().Unix()) - ds.Stamp
-	fmt.Printf("sender %v received response for %v at %v seconds later than expected\n", s.name, i, diff-ds.Duration)
-}