Re: [PATCH v3 -tip] sched: Clean unused fields from struct rq

[Gregory Haskins]

Ingo Molnar wrote:
> * Luis Henriques <henrix@xxxxxxx> wrote:
>
>   
>>
>> Btw: I tried Greg schedtop with this patch and the app behaviour is as expected:
>>
>>   $ ./schedtop 
>>   Exception: unsupported version
>>     
>
> Mind updating the app too and post it here please? It's the only app 
> that relies on this file AFAIK.
>   

I can take care of the update if Luis can just confirm that this patch
works as expected against his new ABI?

--
commit 336a22f597769bb5759d561773d05ce666019677
Author: Gregory Haskins <ghaskins@xxxxxxxxxx>
Date:   Thu Mar 19 07:54:10 2009 -0400

    Update to proposed v15 ABI
   
    Signed-off-by: Gregory Haskins <ghaskins@xxxxxxxxxx>

diff --git a/schedtop.cc b/schedtop.cc
index 4d4c510..f3c9468 100644
--- a/schedtop.cc
+++ b/schedtop.cc
@@ -114,7 +114,7 @@ public:
                            throw std::runtime_error("error parsing
version");
                       
                        lis >> m_version;
-                       if (m_version != 14)
+                       if ((m_version < 14) || (m_version > 15))
                            throw std::runtime_error("unsupported version");
                       
                        state = state_timestamp;
@@ -219,9 +219,11 @@ private:
            std::string basename("/" + FormIndex("cpu", m_cpu) + "/rq/");
            Importer importer(m_smap, is, basename);
 
-           importer += "yld_both_empty";
-           importer += "yld_act_empty";
-           importer += "yld_exp_empty";
+           if (m_version < 15){
+             importer += "yld_both_empty";
+             importer += "yld_act_empty";
+             importer += "yld_exp_empty";
+           }
            importer += "yld_count";
            importer += "sched_switch";
            importer += "sched_count";



----------------

If this patch works, you have my "Acked-by" for Luis' kernel-side patch.

-Greg

Attachment: signature.asc
Description: OpenPGP digital signature