Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cosmetics in the popping generator
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 1 Nov 2014 23:02:41 +0000 (00:02 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 1 Nov 2014 23:06:02 +0000 (00:06 +0100)
src/simix/simcalls.py
src/simix/smx_popping_accessors.h
src/simix/smx_popping_bodies.c
src/simix/smx_popping_enum.h
src/simix/smx_popping_generated.c

index 4e8963f..da4df73 100755 (executable)
@@ -101,7 +101,7 @@ class Simcall(object):
     return True
 
   def enum(self):
-    return 'SIMCALL_%s,'%(self.name.upper())
+    return '  SIMCALL_%s,'%(self.name.upper())
 
   def string(self):
     return '[SIMCALL_%s] = "SIMCALL_%s",'%(self.name.upper(), self.name.upper())       
@@ -200,7 +200,8 @@ def parse(fn):
       resdi.append(sim)
   return simcalls, simcalls_guarded
 
-def header(fd):
+def header(name):
+    fd = open(name, 'w')
     fd.write('/**********************************************************************/\n')
     fd.write('/* File generated by src/simix/simcalls.py from src/simix/simcalls.in */\n')
     fd.write('/*                                                                    */\n')
@@ -208,6 +209,13 @@ def header(fd):
     fd.write('/*                                                                    */\n')
     fd.write('/* change simcalls specification in src/simix/simcalls.in             */\n')  
     fd.write('/**********************************************************************/\n\n')
+    fd.write('/*\n')
+    fd.write(' * Note that the name comes from http://en.wikipedia.org/wiki/Popping\n') 
+    fd.write(' * Indeed, the control flow is doing a strange dance in there.\n')
+    fd.write(' *\n')
+    fd.write(' * That\'s not about http://en.wikipedia.org/wiki/Poop, despite the odor :)\n')
+    fd.write(' */\n\n')
+    return fd
 
 def handle(fd,func, simcalls, guarded_simcalls):
     fd.write('\n'.join(func(simcall) for simcall in simcalls))
@@ -216,14 +224,6 @@ def handle(fd,func, simcalls, guarded_simcalls):
         fd.write('\n'.join(func(simcall) for simcall in list))
         fd.write('\n#endif\n')
 
-def write(fn, func, simcalls, scd,pre="",post=""):
-    fd = open(fn, 'w')
-    header(fd)
-    fd.write(pre)
-    handle(fd, func, simcalls, scd)
-    fd.write(post)
-    fd.close()
-
 if __name__=='__main__':
   import sys
   simcalls, simcalls_dict = parse('simcalls.in')
@@ -237,45 +237,34 @@ if __name__=='__main__':
   #  print ("Some checks fail!")
   #  sys.exit(1)
 
-  write('smx_popping_accessors.h', Simcall.accessors, simcalls, simcalls_dict)
-  
-  
-  fd = open("smx_popping_enum.h", 'w')
-  header(fd)
-  fd.write("""
-/*
- * Note that the name comes from http://en.wikipedia.org/wiki/Popping 
- * Indeed, the control flow is doing a strange dance in there.
- *
- * That\'s not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
- */
-
-/**
- * @brief All possible simcalls.
- */
-typedef enum {
-SIMCALL_NONE,
-  """)
+  ###
+  ### smx_popping_accessors.c
+  ###
+  fd = header('smx_popping_accessors.h')
+  handle(fd, Simcall.accessors, simcalls, simcalls_dict)
+  fd.close()
+
+  ###
+  ### smx_popping_enum.c
+  ###
+  fd = header("smx_popping_enum.h")
+  fd.write('/**\n')
+  fd.write(' * @brief All possible simcalls.\n')
+  fd.write(' */\n')
+  fd.write('typedef enum {\n')
+  fd.write('  SIMCALL_NONE,\n')
   
   handle(fd, Simcall.enum, simcalls, simcalls_dict)
   
-  fd.write("""
-NUM_SIMCALLS
-} e_smx_simcall_t;
-  """)
-
-  
+  fd.write('  NUM_SIMCALLS\n')
+  fd.write('} e_smx_simcall_t;\n')
   fd.close()
 
+  ###
+  ### smx_popping_generated.c
+  ###
   
-  fd = open("smx_popping_generated.c", 'w')
-  header(fd)
-  fd.write('/*\n')
-  fd.write(' * Note that the name comes from http://en.wikipedia.org/wiki/Popping \n')
-  fd.write(' * Indeed, the control flow is doing a strange dance in there.\n')
-  fd.write(' *\n')
-  fd.write(' * That\'s not about http://en.wikipedia.org/wiki/Poop, despite the odor :)\n')
-  fd.write(' */\n\n')
+  fd = header("smx_popping_generated.c")
   
   fd.write('#include "smx_private.h"\n');
   fd.write('#ifdef HAVE_MC\n');
@@ -321,4 +310,9 @@ NUM_SIMCALLS
   
   fd.close()
   
-  write('smx_popping_bodies.c', Simcall.body, simcalls, simcalls_dict)
+  ###
+  ### smx_popping_bodies.c
+  ###
+  fd = header('smx_popping_bodies.c')
+  handle(fd, Simcall.body, simcalls, simcalls_dict)
+  fd.close()
index ee51802..0c298b9 100644 (file)
@@ -6,6 +6,13 @@
 /* change simcalls specification in src/simix/simcalls.in             */
 /**********************************************************************/
 
+/*
+ * Note that the name comes from http://en.wikipedia.org/wiki/Popping
+ * Indeed, the control flow is doing a strange dance in there.
+ *
+ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
+ */
+
 
 static inline const char* simcall_host_get_by_name__get__name(smx_simcall_t simcall){
   return  simcall->args[0].cc;
index dec23ee..292f6ba 100644 (file)
@@ -6,6 +6,13 @@
 /* change simcalls specification in src/simix/simcalls.in             */
 /**********************************************************************/
 
+/*
+ * Note that the name comes from http://en.wikipedia.org/wiki/Popping
+ * Indeed, the control flow is doing a strange dance in there.
+ *
+ * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
+ */
+
   
 inline static smx_host_t simcall_BODY_host_get_by_name(const char* name) {
     smx_process_t self = SIMIX_process_self();
index 6d7a049..46a84a1 100644 (file)
@@ -6,9 +6,8 @@
 /* change simcalls specification in src/simix/simcalls.in             */
 /**********************************************************************/
 
-
 /*
- * Note that the name comes from http://en.wikipedia.org/wiki/Popping 
+ * Note that the name comes from http://en.wikipedia.org/wiki/Popping
  * Indeed, the control flow is doing a strange dance in there.
  *
  * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)
  * @brief All possible simcalls.
  */
 typedef enum {
-SIMCALL_NONE,
+  SIMCALL_NONE,
   SIMCALL_HOST_GET_BY_NAME,
-SIMCALL_HOST_GET_NAME,
-SIMCALL_HOST_ON,
-SIMCALL_HOST_OFF,
-SIMCALL_HOST_GET_PROPERTIES,
-SIMCALL_HOST_GET_CORE,
-SIMCALL_HOST_GET_PROCESS_LIST,
-SIMCALL_HOST_GET_SPEED,
-SIMCALL_HOST_GET_AVAILABLE_SPEED,
-SIMCALL_HOST_GET_STATE,
-SIMCALL_HOST_GET_CURRENT_POWER_PEAK,
-SIMCALL_HOST_GET_POWER_PEAK_AT,
-SIMCALL_HOST_GET_NB_PSTATES,
-SIMCALL_HOST_SET_POWER_PEAK_AT,
-SIMCALL_HOST_GET_CONSUMED_ENERGY,
-SIMCALL_HOST_EXECUTE,
-SIMCALL_HOST_PARALLEL_EXECUTE,
-SIMCALL_HOST_EXECUTION_DESTROY,
-SIMCALL_HOST_EXECUTION_CANCEL,
-SIMCALL_HOST_EXECUTION_GET_REMAINS,
-SIMCALL_HOST_EXECUTION_GET_STATE,
-SIMCALL_HOST_EXECUTION_SET_PRIORITY,
-SIMCALL_HOST_EXECUTION_SET_BOUND,
-SIMCALL_HOST_EXECUTION_SET_AFFINITY,
-SIMCALL_HOST_EXECUTION_WAIT,
-SIMCALL_HOST_GET_MOUNTED_STORAGE_LIST,
-SIMCALL_HOST_GET_ATTACHED_STORAGE_LIST,
-SIMCALL_HOST_GET_PARAMS,
-SIMCALL_HOST_SET_PARAMS,
-SIMCALL_VM_CREATE,
-SIMCALL_VM_START,
-SIMCALL_VM_GET_STATE,
-SIMCALL_VM_MIGRATE,
-SIMCALL_VM_GET_PM,
-SIMCALL_VM_SET_BOUND,
-SIMCALL_VM_SET_AFFINITY,
-SIMCALL_VM_DESTROY,
-SIMCALL_VM_SUSPEND,
-SIMCALL_VM_RESUME,
-SIMCALL_VM_SHUTDOWN,
-SIMCALL_VM_SAVE,
-SIMCALL_VM_RESTORE,
-SIMCALL_PROCESS_CREATE,
-SIMCALL_PROCESS_KILL,
-SIMCALL_PROCESS_KILLALL,
-SIMCALL_PROCESS_CLEANUP,
-SIMCALL_PROCESS_CHANGE_HOST,
-SIMCALL_PROCESS_SUSPEND,
-SIMCALL_PROCESS_RESUME,
-SIMCALL_PROCESS_COUNT,
-SIMCALL_PROCESS_GET_PID,
-SIMCALL_PROCESS_GET_PPID,
-SIMCALL_PROCESS_GET_DATA,
-SIMCALL_PROCESS_SET_DATA,
-SIMCALL_PROCESS_GET_HOST,
-SIMCALL_PROCESS_GET_NAME,
-SIMCALL_PROCESS_IS_SUSPENDED,
-SIMCALL_PROCESS_GET_PROPERTIES,
-SIMCALL_PROCESS_JOIN,
-SIMCALL_PROCESS_SLEEP,
-SIMCALL_PROCESS_ON_EXIT,
-SIMCALL_PROCESS_AUTO_RESTART_SET,
-SIMCALL_PROCESS_RESTART,
-SIMCALL_RDV_CREATE,
-SIMCALL_RDV_DESTROY,
-SIMCALL_RDV_COMM_COUNT_BY_HOST,
-SIMCALL_RDV_GET_HEAD,
-SIMCALL_RDV_SET_RECEIVER,
-SIMCALL_RDV_GET_RECEIVER,
-SIMCALL_COMM_IPROBE,
-SIMCALL_COMM_SEND,
-SIMCALL_COMM_ISEND,
-SIMCALL_COMM_RECV,
-SIMCALL_COMM_IRECV,
-SIMCALL_COMM_CANCEL,
-SIMCALL_COMM_WAITANY,
-SIMCALL_COMM_WAIT,
-SIMCALL_COMM_TEST,
-SIMCALL_COMM_TESTANY,
-SIMCALL_COMM_GET_REMAINS,
-SIMCALL_COMM_GET_STATE,
-SIMCALL_COMM_GET_SRC_DATA,
-SIMCALL_COMM_GET_DST_DATA,
-SIMCALL_COMM_GET_SRC_PROC,
-SIMCALL_COMM_GET_DST_PROC,
-SIMCALL_MUTEX_INIT,
-SIMCALL_MUTEX_DESTROY,
-SIMCALL_MUTEX_LOCK,
-SIMCALL_MUTEX_TRYLOCK,
-SIMCALL_MUTEX_UNLOCK,
-SIMCALL_COND_INIT,
-SIMCALL_COND_DESTROY,
-SIMCALL_COND_SIGNAL,
-SIMCALL_COND_WAIT,
-SIMCALL_COND_WAIT_TIMEOUT,
-SIMCALL_COND_BROADCAST,
-SIMCALL_SEM_INIT,
-SIMCALL_SEM_DESTROY,
-SIMCALL_SEM_RELEASE,
-SIMCALL_SEM_WOULD_BLOCK,
-SIMCALL_SEM_ACQUIRE,
-SIMCALL_SEM_ACQUIRE_TIMEOUT,
-SIMCALL_SEM_GET_CAPACITY,
-SIMCALL_FILE_READ,
-SIMCALL_FILE_WRITE,
-SIMCALL_FILE_OPEN,
-SIMCALL_FILE_CLOSE,
-SIMCALL_FILE_UNLINK,
-SIMCALL_FILE_GET_SIZE,
-SIMCALL_FILE_TELL,
-SIMCALL_FILE_SEEK,
-SIMCALL_FILE_GET_INFO,
-SIMCALL_FILE_MOVE,
-SIMCALL_STORAGE_GET_FREE_SIZE,
-SIMCALL_STORAGE_GET_USED_SIZE,
-SIMCALL_STORAGE_GET_PROPERTIES,
-SIMCALL_STORAGE_GET_CONTENT,
-SIMCALL_ASR_GET_PROPERTIES,
+  SIMCALL_HOST_GET_NAME,
+  SIMCALL_HOST_ON,
+  SIMCALL_HOST_OFF,
+  SIMCALL_HOST_GET_PROPERTIES,
+  SIMCALL_HOST_GET_CORE,
+  SIMCALL_HOST_GET_PROCESS_LIST,
+  SIMCALL_HOST_GET_SPEED,
+  SIMCALL_HOST_GET_AVAILABLE_SPEED,
+  SIMCALL_HOST_GET_STATE,
+  SIMCALL_HOST_GET_CURRENT_POWER_PEAK,
+  SIMCALL_HOST_GET_POWER_PEAK_AT,
+  SIMCALL_HOST_GET_NB_PSTATES,
+  SIMCALL_HOST_SET_POWER_PEAK_AT,
+  SIMCALL_HOST_GET_CONSUMED_ENERGY,
+  SIMCALL_HOST_EXECUTE,
+  SIMCALL_HOST_PARALLEL_EXECUTE,
+  SIMCALL_HOST_EXECUTION_DESTROY,
+  SIMCALL_HOST_EXECUTION_CANCEL,
+  SIMCALL_HOST_EXECUTION_GET_REMAINS,
+  SIMCALL_HOST_EXECUTION_GET_STATE,
+  SIMCALL_HOST_EXECUTION_SET_PRIORITY,
+  SIMCALL_HOST_EXECUTION_SET_BOUND,
+  SIMCALL_HOST_EXECUTION_SET_AFFINITY,
+  SIMCALL_HOST_EXECUTION_WAIT,
+  SIMCALL_HOST_GET_MOUNTED_STORAGE_LIST,
+  SIMCALL_HOST_GET_ATTACHED_STORAGE_LIST,
+  SIMCALL_HOST_GET_PARAMS,
+  SIMCALL_HOST_SET_PARAMS,
+  SIMCALL_VM_CREATE,
+  SIMCALL_VM_START,
+  SIMCALL_VM_GET_STATE,
+  SIMCALL_VM_MIGRATE,
+  SIMCALL_VM_GET_PM,
+  SIMCALL_VM_SET_BOUND,
+  SIMCALL_VM_SET_AFFINITY,
+  SIMCALL_VM_DESTROY,
+  SIMCALL_VM_SUSPEND,
+  SIMCALL_VM_RESUME,
+  SIMCALL_VM_SHUTDOWN,
+  SIMCALL_VM_SAVE,
+  SIMCALL_VM_RESTORE,
+  SIMCALL_PROCESS_CREATE,
+  SIMCALL_PROCESS_KILL,
+  SIMCALL_PROCESS_KILLALL,
+  SIMCALL_PROCESS_CLEANUP,
+  SIMCALL_PROCESS_CHANGE_HOST,
+  SIMCALL_PROCESS_SUSPEND,
+  SIMCALL_PROCESS_RESUME,
+  SIMCALL_PROCESS_COUNT,
+  SIMCALL_PROCESS_GET_PID,
+  SIMCALL_PROCESS_GET_PPID,
+  SIMCALL_PROCESS_GET_DATA,
+  SIMCALL_PROCESS_SET_DATA,
+  SIMCALL_PROCESS_GET_HOST,
+  SIMCALL_PROCESS_GET_NAME,
+  SIMCALL_PROCESS_IS_SUSPENDED,
+  SIMCALL_PROCESS_GET_PROPERTIES,
+  SIMCALL_PROCESS_JOIN,
+  SIMCALL_PROCESS_SLEEP,
+  SIMCALL_PROCESS_ON_EXIT,
+  SIMCALL_PROCESS_AUTO_RESTART_SET,
+  SIMCALL_PROCESS_RESTART,
+  SIMCALL_RDV_CREATE,
+  SIMCALL_RDV_DESTROY,
+  SIMCALL_RDV_COMM_COUNT_BY_HOST,
+  SIMCALL_RDV_GET_HEAD,
+  SIMCALL_RDV_SET_RECEIVER,
+  SIMCALL_RDV_GET_RECEIVER,
+  SIMCALL_COMM_IPROBE,
+  SIMCALL_COMM_SEND,
+  SIMCALL_COMM_ISEND,
+  SIMCALL_COMM_RECV,
+  SIMCALL_COMM_IRECV,
+  SIMCALL_COMM_CANCEL,
+  SIMCALL_COMM_WAITANY,
+  SIMCALL_COMM_WAIT,
+  SIMCALL_COMM_TEST,
+  SIMCALL_COMM_TESTANY,
+  SIMCALL_COMM_GET_REMAINS,
+  SIMCALL_COMM_GET_STATE,
+  SIMCALL_COMM_GET_SRC_DATA,
+  SIMCALL_COMM_GET_DST_DATA,
+  SIMCALL_COMM_GET_SRC_PROC,
+  SIMCALL_COMM_GET_DST_PROC,
+  SIMCALL_MUTEX_INIT,
+  SIMCALL_MUTEX_DESTROY,
+  SIMCALL_MUTEX_LOCK,
+  SIMCALL_MUTEX_TRYLOCK,
+  SIMCALL_MUTEX_UNLOCK,
+  SIMCALL_COND_INIT,
+  SIMCALL_COND_DESTROY,
+  SIMCALL_COND_SIGNAL,
+  SIMCALL_COND_WAIT,
+  SIMCALL_COND_WAIT_TIMEOUT,
+  SIMCALL_COND_BROADCAST,
+  SIMCALL_SEM_INIT,
+  SIMCALL_SEM_DESTROY,
+  SIMCALL_SEM_RELEASE,
+  SIMCALL_SEM_WOULD_BLOCK,
+  SIMCALL_SEM_ACQUIRE,
+  SIMCALL_SEM_ACQUIRE_TIMEOUT,
+  SIMCALL_SEM_GET_CAPACITY,
+  SIMCALL_FILE_READ,
+  SIMCALL_FILE_WRITE,
+  SIMCALL_FILE_OPEN,
+  SIMCALL_FILE_CLOSE,
+  SIMCALL_FILE_UNLINK,
+  SIMCALL_FILE_GET_SIZE,
+  SIMCALL_FILE_TELL,
+  SIMCALL_FILE_SEEK,
+  SIMCALL_FILE_GET_INFO,
+  SIMCALL_FILE_MOVE,
+  SIMCALL_STORAGE_GET_FREE_SIZE,
+  SIMCALL_STORAGE_GET_USED_SIZE,
+  SIMCALL_STORAGE_GET_PROPERTIES,
+  SIMCALL_STORAGE_GET_CONTENT,
+  SIMCALL_ASR_GET_PROPERTIES,
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-SIMCALL_COMM_IS_LATENCY_BOUNDED,
+  SIMCALL_COMM_IS_LATENCY_BOUNDED,
 #endif
 
 #ifdef HAVE_TRACING
-SIMCALL_SET_CATEGORY,
+  SIMCALL_SET_CATEGORY,
 #endif
 
 #ifdef HAVE_MC
-SIMCALL_MC_SNAPSHOT,
-SIMCALL_MC_COMPARE_SNAPSHOTS,
-SIMCALL_MC_RANDOM,
+  SIMCALL_MC_SNAPSHOT,
+  SIMCALL_MC_COMPARE_SNAPSHOTS,
+  SIMCALL_MC_RANDOM,
 #endif
-
-NUM_SIMCALLS
+  NUM_SIMCALLS
 } e_smx_simcall_t;
-  
\ No newline at end of file
index 03a18ea..4583b87 100644 (file)
@@ -7,7 +7,7 @@
 /**********************************************************************/
 
 /*
- * Note that the name comes from http://en.wikipedia.org/wiki/Popping 
+ * Note that the name comes from http://en.wikipedia.org/wiki/Popping
  * Indeed, the control flow is doing a strange dance in there.
  *
  * That's not about http://en.wikipedia.org/wiki/Poop, despite the odor :)