Use early return

dynatrace-oss · Feb 22, 2024 · 76cdd24 · 76cdd24
1 parent 739dec1
commit 76cdd24
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/libebpfdiscoveryskel/src/SyscallProbes.h b/libebpfdiscoveryskel/src/SyscallProbes.h
@@ -293,29 +293,33 @@ __attribute__((always_inline)) inline static int handleSysRecvmsgExit(struct pt_
 		return 0;
 	}
 
-	if (bytesCount > 0) {
-		for (size_t i = 0; i < DISCOVERY_HANDLER_MAX_IOVLEN && i < readSyscallVectorArgsPtr->iovlen; i++) {
-			struct ReadSyscallScalarArgs readSyscallScalarArgs = {
-					.fd = readSyscallVectorArgsPtr->fd,
-			};
-
-			bpf_probe_read(&readSyscallScalarArgs.buf, sizeof(void*), &readSyscallVectorArgsPtr->iov[i].iov_base);
-			if (readSyscallScalarArgs.buf == NULL) {
-				handleNoMoreDataForReading(ctx, globalStatePtr, allSessionStatePtr, readSyscallScalarArgs.fd, pidTgid);
-				return 0;
-			}
-
-			size_t iovLen;
-			bpf_probe_read(&iovLen, sizeof(size_t), &readSyscallVectorArgsPtr->iov[i].iov_len);
-
-			struct ReadSyscallHandlerArgs readSyscallHandlerArgs = {
-					.fd = readSyscallScalarArgs.fd,
-					.buf = readSyscallScalarArgs.buf,
-					.bytesCount = (ssize_t) iovLen,
-			};
-
-			handleRead(ctx, globalStatePtr, allSessionStatePtr, &readSyscallHandlerArgs, pidTgid);
+	if (bytesCount <= 0) {
+		bpf_map_delete_elem(&runningReadSyscallVectorArgsMap, &pidTgid);
+
+		return 0;
+	}
+
+	for (size_t i = 0; i < DISCOVERY_HANDLER_MAX_IOVLEN && i < readSyscallVectorArgsPtr->iovlen; i++) {
+		struct ReadSyscallScalarArgs readSyscallScalarArgs = {
+				.fd = readSyscallVectorArgsPtr->fd,
+		};
+
+		bpf_probe_read(&readSyscallScalarArgs.buf, sizeof(void*), &readSyscallVectorArgsPtr->iov[i].iov_base);
+		if (readSyscallScalarArgs.buf == NULL) {
+			handleNoMoreDataForReading(ctx, globalStatePtr, allSessionStatePtr, readSyscallScalarArgs.fd, pidTgid);
+			return 0;
 		}
+
+		size_t iovLen;
+		bpf_probe_read(&iovLen, sizeof(size_t), &readSyscallVectorArgsPtr->iov[i].iov_len);
+
+		struct ReadSyscallHandlerArgs readSyscallHandlerArgs = {
+				.fd = readSyscallScalarArgs.fd,
+				.buf = readSyscallScalarArgs.buf,
+				.bytesCount = (ssize_t) iovLen,
+		};
+
+		handleRead(ctx, globalStatePtr, allSessionStatePtr, &readSyscallHandlerArgs, pidTgid);
 	}
 
 	bpf_map_delete_elem(&runningReadSyscallVectorArgsMap, &pidTgid);