Cleanup

Assignment8/code/disk.c

@@ -57,10 +57,6 @@ void delete(DiskQueue *queue, DiskRequest request) {
 	exit(EXIT_FAILURE);
 }
 
-DiskRequest peek(DiskQueue *queue) {
-	return *queue->head;
-}
-
 DiskRequest *dequeue(DiskQueue *queue) {
 	DiskRequest *head = queue->head;
 	queue->head = head->next;
@@ -81,26 +77,34 @@ void destroyDiskQueue(DiskQueue *queue) {
 
 DiskRequest* findClosest(DiskQueue *queue, int position, double time) {
 	DiskRequest *current = queue->head;
-	DiskRequest *closest = NULL;
+	DiskRequest *next = NULL;
+	DiskRequest *first = NULL;
 	while (current != NULL) {
 		if (current->time <= time) { // Filter out requests that haven't come in yet
-			if (closest == NULL) { // If there is no closest yet, set it to the current
-				closest = current;
+			if (first == NULL) {
+				first = current;
 			} else {
-				int closestDistance = closest->position - position; // Distance from the closest to the current position, negative means down (bad)
-				int currentDistance = current->position - position; // Distance from the current to the current position, negative means down (bad)
-				if (currentDistance > 0) { // If the current is up
-					if (currentDistance < closestDistance) { // If the current is closer than the closest
-						closest = current;
+				if (current->position < first->position) {
+					first = current;
+				}
+			}
+			int currentDistance = current->position - position; // Distance from the current to the current position, negative means down (bad)
+			if (currentDistance > 0) { // If the current is up
+				if (next == NULL) { // If there is no next yet, set it to the current
+					next = current;
+				} else {
+					int nextDistance = next->position - position; // Distance from the next to the current position, negative means down (bad)
+					if (currentDistance < nextDistance) { // If the current is closer than the next
+						next = current;
 					}
 				}
 			}
 		}
 		current = current->next;
 	}
-	// Bad
-	if (closest == NULL) {
-		return NULL;
+	// If we didn't find a request that is above the current position, return the first as a fallback
+	if (next == NULL) {
+		return first;
 	}
-	return closest;
+	return next;
 }

Assignment8/code/disk.h

@@ -21,8 +21,6 @@ void enqueue(DiskQueue *queue, int time, int position);
 
 void delete(DiskQueue *queue, DiskRequest request);
 
-DiskRequest peek(DiskQueue *queue);
-
 DiskRequest *dequeue(DiskQueue *queue);
 
 DiskRequest *findClosest(DiskQueue *queue, int position, double time);

Assignment8/code/main.c

@@ -68,7 +68,6 @@ void cscan(int start) {
 		if (request != NULL) {
 			delete(queue, *request);
 		}
-		//printf("Movement: %i Time:%.1lf\n", movement, seekTime);
 	}
 }
 
@@ -93,4 +92,4 @@ int main(int argc, char **argv) {
 	destroyDiskQueue(queue);
 
 	return 0;
-}
+}