Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 455fd26c authored by Abhijeet Kaur's avatar Abhijeet Kaur
Browse files

Remove unused function GetPidByName() 

Due to the fix b/132919954, this function is no longer needed.

Bug: 133223733
Test: builds
Test: All tests pass
    * First create `/data/nativetest64`:
    	adb shell mkdir /data/nativetest64
    * Then run:
        mmm -j frameworks/native/cmds/dumpstate/ \
	&& adb push ${OUT}/data/nativetest64/dumpstate_* /data/nativetest64 \
	&& adb shell /data/nativetest64/dumpstate_test/dumpstate_test
Change-Id: Id52455d8bb82909706e0b2606aa1811c9faf1d69
parent 8475fc34

cmds/dumpstate/DumpstateUtil.cpp

+0 −28
Original line number Original line Diff line number Diff line
@@ -378,34 +378,6 @@ int RunCommandToFd(int fd, const std::string& title, const std::vector<std::stri 
    return status;

    return status;

}

}





int GetPidByName(const std::string& ps_name) {

    DIR* proc_dir;

    struct dirent* ps;

    unsigned int pid;

    std::string cmdline;



    if (!(proc_dir = opendir("/proc"))) {

        MYLOGE("Can't open /proc\n");

        return -1;

    }



    while ((ps = readdir(proc_dir))) {

        if (!(pid = atoi(ps->d_name))) {

            continue;

        }

        android::base::ReadFileToString("/proc/" + std::string(ps->d_name) + "/cmdline", &cmdline);

        if (cmdline.find(ps_name) == std::string::npos) {

            continue;

        } else {

            closedir(proc_dir);

            return pid;

        }

    }

    MYLOGE("can't find the pid\n");

    closedir(proc_dir);

    return -1;

}



}  // namespace dumpstate

}  // namespace dumpstate

}  // namespace os

}  // namespace os

}  // namespace android
 
}  // namespace android

cmds/dumpstate/DumpstateUtil.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -205,12 +205,6 @@ int RunCommandToFd(int fd, const std::string& title, const std::vector<std::stri 
 */

 */

int DumpFileToFd(int fd, const std::string& title, const std::string& path);

int DumpFileToFd(int fd, const std::string& title, const std::string& path);





/*

 * Finds the process id by process name.

 * |ps_name| the process name we want to search for

 */

int GetPidByName(const std::string& ps_name);



}  // namespace dumpstate

}  // namespace dumpstate

}  // namespace os

}  // namespace os

}  // namespace android

}  // namespace android

cmds/dumpstate/tests/dumpstate_test.cpp

+0 −20
Original line number Original line Diff line number Diff line
@@ -1407,14 +1407,6 @@ class DumpstateUtilTest : public DumpstateBaseTest { 
        return status;

        return status;

    }

    }





    // Find out the pid of the process_name

    int FindPidOfProcess(const std::string& process_name) {

        CaptureStderr();

        int status = GetPidByName(process_name);

        err = GetCapturedStderr();

        return status;

    }



    int fd;

    int fd;





    // 'fd` output and `stderr` from the last command ran.

    // 'fd` output and `stderr` from the last command ran.
@@ -1764,18 +1756,6 @@ TEST_F(DumpstateUtilTest, DumpFileOnDryRun) { 
    EXPECT_THAT(out, EndsWith("skipped on dry run\n"));

    EXPECT_THAT(out, EndsWith("skipped on dry run\n"));

}

}





TEST_F(DumpstateUtilTest, FindingPidWithExistingProcess) {

    // init process always has pid 1.

    EXPECT_EQ(1, FindPidOfProcess("init"));

    EXPECT_THAT(err, IsEmpty());

}



TEST_F(DumpstateUtilTest, FindingPidWithNotExistingProcess) {

    // find the process with abnormal name.

    EXPECT_EQ(-1, FindPidOfProcess("abcdef12345-543"));

    EXPECT_THAT(err, StrEq("can't find the pid\n"));

}



}  // namespace dumpstate

}  // namespace dumpstate

}  // namespace os

}  // namespace os

}  // namespace android
 
}  // namespace android