lscpu: use new code to read CPUs info

and remove test program from lscpu-cputype.c.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
index 293e4694b3cfccc0f5e7c578e5376585dfaf42c2..e0f3636fdfb3b2ba5ba597c3d800072be3a01abd 100644 (file)
--- a/sys-utils/lscpu-cputype.c
+++ b/sys-utils/lscpu-cputype.c
@@ -832,38 +832,3 @@ done:
        ul_unref_path(sys);
        return 0;
 }
-
-#ifdef TEST_PROGRAM_CPUTYPE
-/* TODO: move to lscpu.c */
-int main(int argc, char **argv)
-{
-       struct lscpu_cxt *cxt;
-
-       cxt = lscpu_new_context();
-
-       if (argc == 3 && strcmp(argv[1], "--prefix") == 0) {
-               cxt->prefix = argv[2];
-               cxt->noalive = 1;
-       }
-
-       lscpu_init_debug();
-
-       context_init_paths(cxt);
-
-       lscpu_read_cpulists(cxt);
-       lscpu_read_cpuinfo(cxt);
-       cxt->arch = lscpu_read_architecture(cxt);
-
-       lscpu_read_archext(cxt);
-       lscpu_read_vulnerabilities(cxt);
-       lscpu_read_numas(cxt);
-       lscpu_read_topology(cxt);
-
-       lscpu_decode_arm(cxt);
-
-       cxt->virt = lscpu_read_virtualization(cxt);
-
-       lscpu_free_context(cxt);
-       return EXIT_SUCCESS;
-}
-#endif /* TEST_PROGRAM_CPUTYPES */

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index f429b43a50bee4dc48ed782f8d5f925c641ffa8d..ace20f91d90642f7ec52d788408840634f0cffaf 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1132,8 +1132,6 @@ int main(int argc, char *argv[])
        textdomain(PACKAGE);
        close_stdout_atexit();
 
-       lscpu_init_debug();
-
        cxt = lscpu_new_context();
 
        while ((c = getopt_long(argc, argv, "aBbC::ce::hJp::s:xyV", longopts, NULL)) != -1) {
@@ -1234,53 +1232,25 @@ int main(int argc, char *argv[])
                cxt->show_online = 1;
                cxt->show_offline = cxt->mode == LSCPU_OUTPUT_READABLE ? 1 : 0;
        }
-#ifdef LSCPU_OLD_OUTPUT_CODE
-       ul_path_init_debug();
 
-       /* /sys/devices/system/cpu */
-       desc->syscpu = ul_new_path(_PATH_SYS_CPU);
-       if (!desc->syscpu)
-               err(EXIT_FAILURE, _("failed to initialize CPUs sysfs handler"));
-       if (desc->prefix)
-               ul_path_set_prefix(desc->syscpu, desc->prefix);
-
-       /* /proc */
-       desc->procfs = ul_new_path("/proc");
-       if (!desc->procfs)
-               err(EXIT_FAILURE, _("failed to initialize procfs handler"));
-       if (desc->prefix)
-               ul_path_set_prefix(desc->procfs, desc->prefix);
+       lscpu_init_debug();
 
-       read_basicinfo(desc, mod);
+       lscpu_context_init_paths(cxt);
 
-       setsize = CPU_ALLOC_SIZE(maxcpus);
+       lscpu_read_cpulists(cxt);
+       lscpu_read_cpuinfo(cxt);
+       cxt->arch = lscpu_read_architecture(cxt);
 
-       for (i = 0; i < desc->ncpuspos; i++) {
-               /* only consider present CPUs */
-               if (desc->present &&
-                   !CPU_ISSET_S(real_cpu_num(desc, i), setsize, desc->present))
-                       continue;
-               read_topology(desc, i);
-               read_cache(desc, i);
-               read_polarization(desc, i);
-               read_address(desc, i);
-               read_configured(desc, i);
-               read_max_mhz(desc, i);
-               read_min_mhz(desc, i);
-       }
-
-       if (desc->caches)
-               qsort(desc->caches, desc->ncaches,
-                               sizeof(struct cpu_cache), cachecmp);
+       lscpu_read_archext(cxt);
+       lscpu_read_vulnerabilities(cxt);
+       lscpu_read_numas(cxt);
+       lscpu_read_topology(cxt);
 
-       if (desc->ecaches)
-               qsort(desc->ecaches, desc->necaches,
-                               sizeof(struct cpu_cache), cachecmp);
+       lscpu_decode_arm(cxt);
 
-       read_nodes(desc);
-       read_hypervisor(desc, mod);
-       arm_cpu_decode(desc, mod);
+       cxt->virt = lscpu_read_virtualization(cxt);
 
+#ifdef LSCPU_OLD_OUTPUT_CODE
        switch(mod->mode) {
        case LSCPU_OUTPUT_SUMMARY:
                print_summary(desc, mod);
@@ -1343,8 +1313,6 @@ int main(int argc, char *argv[])
                break;
        }
 
-       ul_unref_path(desc->syscpu);
-       ul_unref_path(desc->procfs);
 #endif /* LSCPU_OLD_OUTPUT_CODE */
 
        lscpu_free_context(cxt);