From 489566ca0e69ed6068fb4bdbaccd413ec2ee8319 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 22 Oct 2010 23:39:54 -0700 Subject: xsmp.xml: Clean up tables Signed-off-by: Alan Coopersmith --- doc/xsmp.xml | 1270 +++++++++++++++++++++++----------------------------------- 1 file changed, 499 insertions(+), 771 deletions(-) diff --git a/doc/xsmp.xml b/doc/xsmp.xml index c2d41d8..050b8b9 100644 --- a/doc/xsmp.xml +++ b/doc/xsmp.xml @@ -246,59 +246,59 @@ the receiver of the message to the sender of the message. - + - Type Name - Description + Type Name + Description - BOOL - False or True + BOOL + False or True - INTERACT_STYLE - None Errors or Any + INTERACT_STYLE + None Errors or Any - DIALOG_TYPE - Error or Normal + DIALOG_TYPE + Error or Normal - SAVE_TYPE - Global Local or Both + SAVE_TYPE + Global Local or Both - CARD8 - a one-byte unsigned integer + CARD8 + a one-byte unsigned integer - CARD16 - a two-byte unsigned integer + CARD16 + a two-byte unsigned integer - CARD32 - a four-byte unsigned integer + CARD32 + a four-byte unsigned integer - ARRAY8 - a sequence of CARD8s + ARRAY8 + a sequence of CARD8s - LISTofARRAY8 - a sequence of ARRAY8s + LISTofARRAY8 + a sequence of ARRAY8s - PROPERTY - a property name (an ARRAY8), a type name, and a value of that type + PROPERTY + a property name (an ARRAY8), a type name, and a value of that type - LISTofPROPERTY - a counted collection of ­PROPERTYs. + LISTofPROPERTY + a counted collection of ­PROPERTYs. @@ -1115,266 +1115,193 @@ client and the SM. Types - - + + + - + + + - BOOL + BOOL - - - 0 - False + 0 + False - 1 - True + 1 + True - - - - - - - - - INTERACT_STYLE + INTERACT_STYLE - - - 0 - None + 0 + None - 1 - Errors + 1 + Errors - 2 - Any + 2 + Any - - - - - - - - - DIALOG_TYPE + DIALOG_TYPE - - - 0 - Error + 0 + Error - 1 - Normal + 1 + Normal - - - - - - - - - SAVE_TYPE + SAVE_TYPE - - - 0 - Global + 0 + Global - 1 - Local + 1 + Local - 2 - Both + 2 + Both - - - - - - - - - - ARRAY8 + ARRAY8 - - - 4 - CARD32 - length + 4 + CARD32 + length - n - ListofCARD8, the array - p = pad (4 + n, 8) + n + ListofCARD8, the array + p = pad (4 + n, 8) - 2 - Both + 2 + Both - - - - - - - - - - LISTofARRAY8 + LISTofARRAY8 - - - 4 - CARD32 - count + 4 + CARD32 + count - 4 - - unused + 4 + + unused - a - ARRAY8 - first array + a + ARRAY8 + first array - b - ARRAY8 - second array + b + ARRAY8 + second array - . - - + . + + - . - - + . + + - . - - + . + + - q - ARRAY8 - last array + q + ARRAY8 + last array - - - - - - - - - - PROPERTY + PROPERTY - - - a - ARRAY8 - name + a + ARRAY8 + name - b - ARRAY8 - type (XPCS encoded in Latin-1, case sensitive) + b + ARRAY8 + type (XPCS encoded in Latin-1, case sensitive) - c - LISTofARRAY8 - values + c + LISTofARRAY8 + values - - - - - - - - - - LISTofPROPERTY + LISTofPROPERTY - - - 4 - CARD32 - count + 4 + CARD32 + count - 4 - - unused + 4 + + unused - a - PROPERTY - first property + a + PROPERTY + first property - b - PROPERTY - second property + b + PROPERTY + second property - . - - + . + + - . - - + . + + - . - - + . + + - q - PROPERTY - last property + q + PROPERTY + last property @@ -1409,762 +1336,563 @@ manager. The session manager should supply this information in the ICE ProtocolReply message. - - + + + - + + - RegisterClient + RegisterClient - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 1 - opcode + 1 + 1 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - ARRAY8 - previous-ID + a + ARRAY8 + previous-ID - - - - - - - - - - RegisterClientReply + RegisterClientReply - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 2 - opcode + 1 + 2 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - ARRAY8 - client-ID + a + ARRAY8 + client-ID - - - - - - - - - - SaveYourself + SaveYourself - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 3 - opcode + 1 + 3 + opcode - 2 - - unused + 2 + + unused - 4 - 1 - length of remaining data in 8-byte units + 4 + 1 + length of remaining data in 8-byte units - 1 - SAVE_TYPE - type + 1 + SAVE_TYPE + type - 1 - BOOL - shutdown + 1 + BOOL + shutdown - 1 - INTERACT_STYLE - interact-style + 1 + INTERACT_STYLE + interact-style - 1 - BOOL - fast + 1 + BOOL + fast - 4 - - unused + 4 + + unused - - - - - - - - - - SaveYourselfRequest + SaveYourselfRequest - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 4 - opcode + 1 + 4 + opcode - 2 - - unused + 2 + + unused - 4 - 1 - length of remainning data in 8-byte units + 4 + 1 + length of remainning data in 8-byte units - 1 - SAVE_TYPE - type + 1 + SAVE_TYPE + type - 1 - BOOL - shutdown + 1 + BOOL + shutdown - 1 - INTERACT_STYLE - interact-style + 1 + INTERACT_STYLE + interact-style - 1 - BOOL - fast + 1 + BOOL + fast - 3 - - unused + 3 + + unused - - - - - - - - - - InteractRequest + InteractRequest - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 5 - opcode + 1 + 5 + opcode - 1 - DIALOG_TYPE - dialog type + 1 + DIALOG_TYPE + dialog type - 1 - - unused + 1 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - Interact + Interact - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 6 - opcode + 1 + 6 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - InteractDone + InteractDone - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 7 - opcode + 1 + 7 + opcode - 1 - BOOL - cancel-shutdown + 1 + BOOL + cancel-shutdown - 1 - - unused + 1 + + unused - - - - - - - - - - - InteractDone + InteractDone - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 7 - opcode + 1 + 7 + opcode - 1 - BOOL - cancel-shutdown + 1 + BOOL + cancel-shutdown - 1 - - unused + 1 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - SaveYourselfDone + SaveYourselfDone - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 8 - opcode + 1 + 8 + opcode - 1 - BOOL - success + 1 + BOOL + success - 1 - - unused + 1 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - Die + Die - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 9 - opcode + 1 + 9 + opcode - 1 - - unused + 1 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - ShutdownCancelled + ShutdownCancelled - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 10 - opcode + 1 + 10 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - ConnectionClosed + ConnectionClosed - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 11 - opcode + 1 + 11 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - LISTofARRAY8 - reason + a + LISTofARRAY8 + reason - - - - - - - - - - SetProperties + SetProperties - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 12 - opcode + 1 + 12 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - LISTofPROPERTY - properties + a + LISTofPROPERTY + properties - - - - - - - - - - DeleteProperties + DeleteProperties - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 13 - opcode + 1 + 13 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - LISTofPROPERTY - properties + a + LISTofPROPERTY + properties - - - - - - - - - - GetProperties + GetProperties - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 14 - opcode + 1 + 14 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - GetPropertiesReply + GetPropertiesReply - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 15 - opcode + 1 + 15 + opcode - 2 - - unused + 2 + + unused - 4 - a/8 - length of remaining data in 8-byte units + 4 + a/8 + length of remaining data in 8-byte units - a - LISTofPROPERTY - properties + a + LISTofPROPERTY + properties - - - - - - - - - - SaveYourselfPhase2Request + SaveYourselfPhase2Request - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 16 - opcode + 1 + 16 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - SaveYourselfPhase2 + SaveYourselfPhase2 - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 17 - opcode + 1 + 17 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units - - - - - - - - - - SaveComplete + SaveComplete - - - 1 - ? - XSMP + 1 + ? + XSMP - 1 - 18 - opcode + 1 + 18 + opcode - 2 - - unused + 2 + + unused - 4 - 0 - length of remaining data in 8-byte units + 4 + 0 + length of remaining data in 8-byte units @@ -2197,85 +1925,85 @@ of stored properties does not extend into subsequent sessions. - - - - - + + + + + - Name - Type - Posix Type - Required? + Name + Type + Posix Type + Required? - CloneCommand - OS-specific - LISTofARRAY8 - Yes + CloneCommand + OS-specific + LISTofARRAY8 + Yes - CurrentDirectory - OS-specific - ARRAY8 - No + CurrentDirectory + OS-specific + ARRAY8 + No - DiscardCommand - OS-specific - LISTofARRAY8 - No* + DiscardCommand + OS-specific + LISTofARRAY8 + No* - Environment - OS-specific - LISTofARRAY8 - No + Environment + OS-specific + LISTofARRAY8 + No - ProcessID - OS-specific - ARRAY8 - No + ProcessID + OS-specific + ARRAY8 + No - Program - OS-specific - ARRAY8 - Yes + Program + OS-specific + ARRAY8 + Yes - RestartCommand - OS-specific - LISTofARRAY8 - Yes + RestartCommand + OS-specific + LISTofARRAY8 + Yes - ResignCommand - OS-specific - LISTofARRAY8 - No + ResignCommand + OS-specific + LISTofARRAY8 + No - RestartStyleHint - CARD8 - CARD8 - No + RestartStyleHint + CARD8 + CARD8 + No - ShutdownCommand - OS-specific - LISTofARRAY8 - No + ShutdownCommand + OS-specific + LISTofARRAY8 + No - UserID - ARRAY8 - ARRAY8 - Yes + UserID + ARRAY8 + ARRAY8 + Yes @@ -2378,31 +2106,31 @@ possible values are as follows: - - - + + + - Name - Value + Name + Value - RestartIfRunning - 0 + RestartIfRunning + 0 - RestartAnyway - 1 + RestartAnyway + 1 - RestartImmediately - 2 + RestartImmediately + 2 - RestartNever - 3 + RestartNever + 3 -- cgit v1.2.3