clang formatting

Author: NicolasJPosey

Simulator/Vertices/NG911/All911Vertices.cpp

@@ -335,7 +335,9 @@ void All911Vertices::advanceCALR(BGSIZE vertexIdx, All911Edges &edges911,
    // // There is only one outgoing edge from CALR to a PSAP
    BGSIZE edgeIdx = edgeIndexMap.outgoingEdgeIndexMap_[edgeIndexMap.outgoingEdgeBegin_[vertexIdx]];
 
-   unsigned char makeAvailable = (1 - edges911.isAvailable_[edgeIdx]) * (1 - edges911.isRedial_[edgeIdx]) * (unsigned char)(initRNG.randDblExc() >= redialP_);
+   unsigned char makeAvailable = (1 - edges911.isAvailable_[edgeIdx])
+                                 * (1 - edges911.isRedial_[edgeIdx])
+                                 * (unsigned char)(initRNG.randDblExc() >= redialP_);
 
    edges911.isAvailable_[edgeIdx] |= makeAvailable;
    edges911.isRedial_[edgeIdx] |= (1 - edges911.isAvailable_[edgeIdx]) * (1 - makeAvailable);
@@ -539,11 +541,13 @@ void All911Vertices::advanceRESP(BGSIZE vertexIdx, All911Edges &edges911,
 
       // The available unit starts serving the call
       int availUnit = -1;
-      for(BGSIZE unitIndex = 0; unitIndex < numServers_[vertexIdx]; unitIndex++) {
+      for (BGSIZE unitIndex = 0; unitIndex < numServers_[vertexIdx]; unitIndex++) {
          // Add 0 if unit is not available or 1 + unitIndex if it's available and a unit has not already been found
          availUnit += (availableUnits[unitIndex] == true && availUnit == -1) * (unitIndex + 1);
          // Flip value only if the unit is available and a unit has not been found
-         availableUnits[unitIndex] = (unsigned char)(availableUnits[unitIndex] == true - (availableUnits[unitIndex] == true && availUnit == -1));
+         availableUnits[unitIndex]
+            = (unsigned char)(availableUnits[unitIndex]
+                              == true - (availableUnits[unitIndex] == true && availUnit == -1));
       }
       servingCall_[vertexIdx][availUnit] = incident;
       answerTime_[vertexIdx][availUnit] = g_simulationStep;

Simulator/Vertices/NG911/All911Vertices_d.cpp

@@ -2767,7 +2767,7 @@ __device__ void advancePSAPVerticesDevice(int vertexIdx, int maxEventsPerEpoch,
    int &queueLengthHistoryQueueEnd = allVerticesDevice->queueLengthHistoryBufferEnd_[vertexIdx];
    allVerticesDevice->queueLengthHistory_[vertexIdx][queueLengthHistoryQueueEnd]
       = stepsPerEpoch * (1 - (allVerticesDevice->vertexQueuesFront_[vertexIdx] >= queueEndIndex))
-        + allVerticesDevice->vertexQueuesFront_[vertexIdx] - queueEndIndex;//queueSize
+        + allVerticesDevice->vertexQueuesFront_[vertexIdx] - queueEndIndex;   //queueSize
    queueLengthHistoryQueueEnd = (queueLengthHistoryQueueEnd + 1) % stepsPerEpoch;
    allVerticesDevice->queueLengthHistoryNumElementsInEpoch_[vertexIdx]++;
    // EventBuffer::insertEvent
@@ -3059,26 +3059,45 @@ __global__ void maybeTakeCallFromEdge(int totalVertices, uint64_t stepsPerEpoch,
 
       // Compute the size of the destination queue
       uint64_t queueFrontIndex = allVerticesDevice->vertexQueuesFront_[dstIndex];
-      int queueFull = (int)((1 - (queueFrontIndex >= allVerticesDevice->vertexQueuesEnd_[dstIndex])) * (allVerticesDevice->numTrunks_[dstIndex] + 1) + queueFrontIndex - allVerticesDevice->vertexQueuesEnd_[dstIndex]) >= (allVerticesDevice->numTrunks_[dstIndex] - allVerticesDevice->busyServers_[dstIndex]);
-      allVerticesDevice->droppedCalls_[dstIndex] += queueFull && (!allEdgesDevice->isRedial_[edgeIdx]);
-      allVerticesDevice->receivedCalls_[dstIndex] += queueFull && (!allEdgesDevice->isRedial_[edgeIdx]);
+      int queueFull
+         = (int)((1 - (queueFrontIndex >= allVerticesDevice->vertexQueuesEnd_[dstIndex]))
+                    * (allVerticesDevice->numTrunks_[dstIndex] + 1)
+                 + queueFrontIndex - allVerticesDevice->vertexQueuesEnd_[dstIndex])
+           >= (allVerticesDevice->numTrunks_[dstIndex] - allVerticesDevice->busyServers_[dstIndex]);
+      allVerticesDevice->droppedCalls_[dstIndex]
+         += queueFull && (!allEdgesDevice->isRedial_[edgeIdx]);
+      allVerticesDevice->receivedCalls_[dstIndex]
+         += queueFull && (!allEdgesDevice->isRedial_[edgeIdx]);
       if (!queueFull) {
          // Transfer call to destination
          // We throw an error if the buffer is full
-         if (((queueFrontIndex + 1) % (allVerticesDevice->numTrunks_[dstIndex] + 1)) == allVerticesDevice->vertexQueuesEnd_[dstIndex]) {
-            printf("ERROR: Vertex queue is full. Vertex ID [%d] Front Index [%" PRIu64 "] End Index [%" PRIu64 "] Buffer size [%" PRIu64 "]\n", dstIndex, queueFrontIndex, allVerticesDevice->vertexQueuesEnd_[dstIndex], (allVerticesDevice->numTrunks_[dstIndex] + 1));
+         if (((queueFrontIndex + 1) % (allVerticesDevice->numTrunks_[dstIndex] + 1))
+             == allVerticesDevice->vertexQueuesEnd_[dstIndex]) {
+            printf("ERROR: Vertex queue is full. Vertex ID [%d] Front Index [%" PRIu64
+                   "] End Index [%" PRIu64 "] Buffer size [%" PRIu64 "]\n",
+                   dstIndex, queueFrontIndex, allVerticesDevice->vertexQueuesEnd_[dstIndex],
+                   (allVerticesDevice->numTrunks_[dstIndex] + 1));
             return;
          }
          // Insert the new element and increment the front index
-         allVerticesDevice->vertexQueuesBufferVertexId_[dstIndex][queueFrontIndex] = allEdgesDevice->vertexId_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferTime_[dstIndex][queueFrontIndex] = allEdgesDevice->time_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferDuration_[dstIndex][queueFrontIndex] = allEdgesDevice->duration_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferX_[dstIndex][queueFrontIndex] = allEdgesDevice->x_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferY_[dstIndex][queueFrontIndex] = allEdgesDevice->y_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferPatience_[dstIndex][queueFrontIndex] = allEdgesDevice->patience_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferOnSiteTime_[dstIndex][queueFrontIndex] = allEdgesDevice->onSiteTime_[edgeIdx];
-         allVerticesDevice->vertexQueuesBufferResponderType_[dstIndex][queueFrontIndex] = allEdgesDevice->responderType_[edgeIdx];
-         allVerticesDevice->vertexQueuesFront_[dstIndex] = (queueFrontIndex + 1) % (allVerticesDevice->numTrunks_[dstIndex] + 1);
+         allVerticesDevice->vertexQueuesBufferVertexId_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->vertexId_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferTime_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->time_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferDuration_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->duration_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferX_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->x_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferY_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->y_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferPatience_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->patience_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferOnSiteTime_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->onSiteTime_[edgeIdx];
+         allVerticesDevice->vertexQueuesBufferResponderType_[dstIndex][queueFrontIndex]
+            = allEdgesDevice->responderType_[edgeIdx];
+         allVerticesDevice->vertexQueuesFront_[dstIndex]
+            = (queueFrontIndex + 1) % (allVerticesDevice->numTrunks_[dstIndex] + 1);
          // Record that we received a call
          allVerticesDevice->receivedCalls_[dstIndex]++;
          allEdgesDevice->isAvailable_[edgeIdx] = true;