bug-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ikiwiki fuckup...


From: Madhusudan C.S
Subject: Re: ikiwiki fuckup...
Date: Tue, 12 Aug 2008 20:18:23 +0530

Hi Thomas,


The procfs change was uncommitted, which I can commit as soon as we know
who's the author, and the other change was a merge conflict which I'll
resolve as soon as I get access to flubber again.


   diff --git a/community/procfs.mdwn b/community/procfs.mdwn
   index 472c66c..b12f407 100644
   --- a/community/procfs.mdwn
   +++ b/community/procfs.mdwn
   @@ -210,6 +210,26 @@ Clone URL: [git://github.com/madhusudancs/procfs.git](git://github.com/madhusuda
    * cnswap
    > Cumulative nswap for child processes (not maintained).

   +* flags
   +> PF_* fields defined in (Not Linux compatible, but nearly says the something Linux says)
   +
   +#####File - /proc/<PID>/statm
   +
   +* size
   +> total program size
   +
   +* resident
   +> resident set size
   +
   +* lib
   +> library
   +
   +* dt
   +> dirty pages
   +
   +#####Other Per-PID Files
   +
   +#####* /proc/<PID>/cwd

    ####I already know the where the information is exactly available.

   @@ -220,15 +240,8 @@ Clone URL: [git://github.com/madhusudancs/procfs.git](git://github.com/madhusuda
    * cstime
    > The number of jiffies that this process's waited-for children have been scheduled in kernel mode.

   -#####File - /proc/<PID>/statm
   -
   -* resident
   -> resident set size
   -
    #####Other Per-PID Files

   -#####* /proc/<PID>/cwd
   -
    #####* /proc/<PID>/exe

    #####* /proc/<PID>/environ
   @@ -266,9 +279,6 @@ Clone URL: [git://github.com/madhusudancs/procfs.git](git://github.com/madhusuda

    #####File - /proc/<PID>/statm

   -* size
   -> total program size
   -
    * text
    > text (code)

   @@ -333,19 +343,17 @@ Clone URL: [git://github.com/madhusudancs/procfs.git](git://github.com/madhusuda
    * delayacct_blkio_ticks
    > Aggregated block I/O delays, measured in clock ticks (centiseconds).

   -* flags
   -> PF_* fields defined in
   -

   -#### Need not be implemented.
   +###Newly added to Roadmap(but these were the original goals of the project)

   -#####File - /proc/<PID>/statm
   -
   -* lib
   -> library (not required)
   +#### procps tools need to be ported so that they run on top of the procfs

   -* dt
   -> dirty pages (not required)
   +> ##### pgrep        -          Done
   +> ##### pkill        -          Done
   +> ##### killall      -          Done
   +> ##### pstree       -          Done
   +> ##### top          -          In progress
   +> ##### free         -          Needs to be worked on


    ------


   diff --cc community/scolobb.mdwn
   index 97d269f,c4c4cbd..0000000
   --- a/community/scolobb.mdwn
   +++ b/community/scolobb.mdwn
   @@@ -34,9 -34,9 +34,17 @@@ The code is at <http://github.com/scolo

     ####TODO:

   ++<<<<<<< HEAD:community/scolobb.mdwn
    +* Provide proxy nodes (modify the standard version of netfs_S_dir_lookup).
   ++=======
   + * Provide shadow nodes (modify the standard version of netfs_S_dir_lookup).
   ++>>>>>>> ea856c169cb58f1120e49d2915753ecfa6c6fae4:community/scolobb.mdwn

   ++<<<<<<< HEAD:community/scolobb.mdwn
    +* Create the generic filtering translator.
   ++=======
   + * Create the generic filter translator.
   ++>>>>>>> ea856c169cb58f1120e49d2915753ecfa6c6fae4:community/scolobb.mdwn

     * Create the translator '0' (providing the untranslated version of the
       node).
   @@@ -62,9 -62,9 +70,17 @@@

     ###Progress

   ++<<<<<<< HEAD:community/scolobb.mdwn
    +####6: Mon Aug 4 - ?
   ++=======
   + ####6: Sun Aug 3 - ?:
   ++>>>>>>> ea856c169cb58f1120e49d2915753ecfa6c6fae4:community/scolobb.mdwn

   ++<<<<<<< HEAD:community/scolobb.mdwn
    +> Implementing the proxy nodes.
   ++=======
   + > Implement the shadow nodes.
   ++>>>>>>> ea856c169cb58f1120e49d2915753ecfa6c6fae4:community/scolobb.mdwn

     ####5: Thu Jul 24 - Thu Jul 24:



Thanks a lot Thomas for taking this responsibility. Yes this diff belongs to me, name : Madhusudan.C.S



--
Thanks and regards,
Madhusudan.C.S

Blogs at: www.madhusudancs.info


reply via email to

[Prev in Thread] Current Thread [Next in Thread]