From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 15 Jun 2005 12:02:44 +0000 (+0000)
Subject: xml desc fix
X-Git-Tag: v0.12.20~2536
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=e3cc790de835c2c47dc3cf18a943abc22d7b895f;hp=2cdb6fcba2deb41e6e894cae0f46d9a58a8c9e85;p=lttv.git

xml desc fix

git-svn-id: http://ltt.polymtl.ca/svn@953 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/genevent/genevent.c b/genevent/genevent.c
index 3add6898..e903fbe1 100644
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -507,7 +507,7 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
     fprintf(fp, "\t\t\t/* Buffer is full*/\n");
     fprintf(fp, "\t\t\t/* for debug BUG(); */\n"); // DEBUG!
     fprintf(fp, "\t\t\tchannel->events_lost[smp_processor_id()]++;\n");
-    fprintf(fp, "\t\t\tgoto commit_work;\n");
+    fprintf(fp, "\t\t\tbreak;\n");	 /* don't commit a NULL reservation! */
     fprintf(fp, "\t\t}\n");
 		
 		/* DEBUG */
@@ -634,8 +634,6 @@ void generateStructFunc(FILE * fp, char * facName, unsigned long checksum){
 			}
     if(structCount + seqCount > 1) fprintf(fp,"\n");
 
-    fprintf(fp,"\n");
-    fprintf(fp,"commit_work:\n");
     fprintf(fp,"\n");
     fprintf(fp, "\t\t/* Commit the work */\n");
     fprintf(fp, "\t\trelay_commit(channel->rchan->buf[smp_processor_id()],\n"
diff --git a/genevent/kernel.xml b/genevent/kernel.xml
index acbebbf4..0a2142ea 100644
--- a/genevent/kernel.xml
+++ b/genevent/kernel.xml
@@ -44,6 +44,7 @@
     <struct>
       <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
       <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
+      <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
      </struct>
   </event>
 
@@ -52,6 +53,7 @@
     <struct>
       <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
       <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
+      <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
      </struct>
   </event>
 
diff --git a/genevent/memory.xml b/genevent/memory.xml
index 2c27d3c5..b6788f6b 100644
--- a/genevent/memory.xml
+++ b/genevent/memory.xml
@@ -6,7 +6,7 @@
     <struct>
       <field name="order"> <description>Order of the page to allocate</description> <uint size=4/> </field>
       <field name="address"> <description>Assigned page address, or 0 if
-			failed.</description> <ulong/> </field>
+			failed.</description> <pointer/> </field>
      </struct>
   </event>
 
@@ -14,35 +14,35 @@
     <description>Page free</description>
     <struct>
       <field name="order"> <description>Order of the page to free</description> <uint size=4/> </field>
-      <field name="address"> <description>Address of the page to free.</description> <ulong/> </field>
+      <field name="address"> <description>Address of the page to free.</description> <pointer/> </field>
      </struct>
   </event>
 
   <event name=swap_in>
     <description>Page swapped into memory</description>
     <struct>
-      <field name="address"> <description>Address of the page to swap in.</description> <ulong/> </field>
+      <field name="address"> <description>Address of the page to swap in.</description> <pointer/> </field>
      </struct>
   </event>
 
   <event name=swap_out>
     <description>Page swapped to disk</description>
     <struct>
-      <field name="address"> <description>Address of the page to swap out.</description> <ulong/> </field>
+      <field name="address"> <description>Address of the page to swap out.</description> <pointer/> </field>
      </struct>
   </event>
 
   <event name=page_wait_start>
     <description>Staring to wait for a page</description>
     <struct>
-      <field name="address"> <description>Address of the page we wait for.</description> <ulong/> </field>
+      <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
      </struct>
   </event>
 
   <event name=page_wait_end>
     <description>Ending wait for a page</description>
     <struct>
-      <field name="address"> <description>Address of the page we wait for.</description> <ulong/> </field>
+      <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
      </struct>
   </event>