Skip to content

optimize(Displayserver): performance up #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

optimize(Displayserver): performance up #636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/detection/displayserver/linux/displayserver_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#include "util/stringUtils.h"

#include <dirent.h>
#include <fcntl.h>

// 2 * (uint32_t string max length is 10 bytes) + 'x' + NUL
#define MODE_FILE_CONTENT_LENGTH 22

static void parseDRM(FFDisplayServerResult* result)
{
Expand All @@ -27,17 +31,26 @@ static void parseDRM(FFDisplayServerResult* result)
ffStrbufAppendS(&drmDir, entry->d_name);
ffStrbufAppendS(&drmDir, "/modes");

FILE* modeFile = fopen(drmDir.chars, "r");
if(modeFile == NULL)
int FF_AUTO_CLOSE_FD modeFileFd = open(drmDir.chars, O_RDONLY);
if(modeFileFd < 0)
{
ffStrbufSubstrBefore(&drmDir, drmDirLength);
continue;
}

uint32_t width = 0, height = 0;

int scanned = fscanf(modeFile, "%ux%u", &width, &height);
if(scanned == 2 && width > 0 && height > 0)
char buf[MODE_FILE_CONTENT_LENGTH] = {0x00};
if (read(modeFileFd, buf, sizeof(char) * (MODE_FILE_CONTENT_LENGTH - 1)) > 0) {
char *sep = strchr(buf, 'x');
if (sep != NULL) {
*sep = '\0';
width = (uint32_t)atoi(buf);
height = (uint32_t)atoi(sep + 1);
}
}

if(width > 0 && height > 0)
{
ffStrbufSubstrBefore(&drmDir, drmDirLength);
ffStrbufAppendS(&drmDir, entry->d_name);
Expand Down Expand Up @@ -71,7 +84,6 @@ static void parseDRM(FFDisplayServerResult* result)
);
}

fclose(modeFile);
ffStrbufSubstrBefore(&drmDir, drmDirLength);
}

Expand Down