From 9f643efe377d2a39929f19cc09e8890afc74d9a4 Mon Sep 17 00:00:00 2001

From: Karel Zak <kzak@redhat.com>

Date: Fri, 24 Jun 2016 12:57:13 +0200

Subject: [PATCH 78/84] lsipc: backport new command

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=1153770

Signed-off-by: Karel Zak <kzak@redhat.com>

---

 bash-completion/lsipc   |   64 +++

 configure.ac            |    6 +

 include/xalloc.h        |    7 +

 sys-utils/Makemodule.am |   10 +

 sys-utils/ipcs.c        |    2 +-

 sys-utils/ipcutils.c    |  116 ++---

 sys-utils/ipcutils.h    |   13 +-

 sys-utils/lsipc.1       |  133 +++++

 sys-utils/lsipc.c       | 1316 +++++++++++++++++++++++++++++++++++++++++++++++

 tests/functions.sh      |   16 +-

 tests/ts/ipcs/limits2   |    9 +-

 11 files changed, 1613 insertions(+), 79 deletions(-)

 create mode 100644 bash-completion/lsipc

 create mode 100644 sys-utils/lsipc.1

 create mode 100644 sys-utils/lsipc.c

diff --git a/bash-completion/lsipc b/bash-completion/lsipc

new file mode 100644

index 0000000..6a87393

--- /dev/null

+++ b/bash-completion/lsipc

@@ -0,0 +1,64 @@

+_lsipc_module()

+{

+	local cur prev OPTS ARG

+	COMPREPLY=()

+	cur="${COMP_WORDS[COMP_CWORD]}"

+	prev="${COMP_WORDS[COMP_CWORD-1]}"

+	case $prev in

+		'-i'|'--id')

+			COMPREPLY=( $(compgen -W "id" -- $cur) )

+			return 0

+			;;

+		'-h'|'--help'|'-V'|'--version')

+			return 0

+			;;

+		'-o'|'--output')

+			local prefix realcur OUTPUT_ALL OUTPUT

+			realcur="${cur##*,}"

+			prefix="${cur%$realcur}"

+			OUTPUT_ALL="GENERAL KEY ID OWNER PERMS CUID

+			CGID UID GID CHANGE MESSAGE USEDBYTES

+			MSGS SEND RECV LSPID LRPID SHARED BYTES

+			NATTCH STATUS ATTACH DETACH CPID LPID NSEMS

+			LASTOP"

+			for WORD in $OUTPUT_ALL; do

+				if ! [[ $prefix == *"$WORD"* ]]; then

+					OUTPUT="$WORD $OUTPUT"

+				fi

+			done

+			compopt -o nospace

+			COMPREPLY=( $(compgen -P "$prefix" -W "$OUTPUT" -S ',' -- $realcur) )

+			return 0

+			;;

+	esac

+	case $cur in

+		-*)

+			OPTS="--id

+				--help

+				--version

+				--shmems

+				--queues

+				--semaphores

+				--colon-separate

+				--creator

+				--export

+				--global

+				--newline

+				--noheadings

+				--notruncate

+				--output

+				--pid

+				--print0

+				--raw

+				--time

+				--time-format"

+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )

+			return 0

+			;;

+	esac

+	local IFS=$'\n'

+	compopt -o filenames

+	COMPREPLY=( $(compgen -f -- $cur) )

+	return 0

+}

+complete -F _lsipc_module lsipc

diff --git a/configure.ac b/configure.ac

index 5d9ea39..fe0a011 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1038,6 +1038,12 @@ UL_REQUIRES_BUILD([lsns], [libsmartcols])

 AM_CONDITIONAL([BUILD_LSNS], [test "x$build_lsns" = xyes])

+UL_BUILD_INIT([lsipc], [check])

+UL_REQUIRES_LINUX([lsipc])

+UL_REQUIRES_BUILD([lsipc], [libsmartcols])

+AM_CONDITIONAL([BUILD_LSIPC], [test "x$build_lsipc" = xyes])

+

+

 UL_BUILD_INIT([chcpu], [check])

 UL_REQUIRES_LINUX([chcpu])

 UL_REQUIRES_HAVE([chcpu], [cpu_set_t], [cpu_set_t type])

diff --git a/include/xalloc.h b/include/xalloc.h

index 6342793..1a1799a 100644

--- a/include/xalloc.h

+++ b/include/xalloc.h

@@ -19,6 +19,13 @@

 # define XALLOC_EXIT_CODE EXIT_FAILURE

 #endif

+static inline void __err_oom(const char *file, unsigned int line)

+{

+	err(XALLOC_EXIT_CODE, "%s: %u: cannot allocate memory", file, line);

+}

+

+#define err_oom()	__err_oom(__FILE__, __LINE__)

+

 static inline __ul_alloc_size(1)

 void *xmalloc(const size_t size)

 {

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am

index 9baf5a3..6badd17 100644

--- a/sys-utils/Makemodule.am

+++ b/sys-utils/Makemodule.am

@@ -22,6 +22,16 @@ ipcs_SOURCES =	sys-utils/ipcs.c \

 ipcs_LDADD = $(LDADD) libcommon.la

+if BUILD_LSIPC

+usrbin_exec_PROGRAMS += lsipc

+dist_man_MANS += sys-utils/lsipc.1

+lsipc_SOURCES =	sys-utils/lsipc.c \

+		sys-utils/ipcutils.c \

+		sys-utils/ipcutils.h

+lsipc_LDADD = $(LDADD) libcommon.la libsmartcols.la

+lsipc_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)

+endif

+

 usrbin_exec_PROGRAMS += renice

 dist_man_MANS += sys-utils/renice.1

 renice_SOURCES = sys-utils/renice.c

diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c

index 14f5f0b..1843cd5 100644

--- a/sys-utils/ipcs.c

+++ b/sys-utils/ipcs.c

@@ -201,7 +201,7 @@ static void do_shm (char format, int unit)

 			       _("max seg size"), lim.shmmax, "\n", 0);

 		ipc_print_size(unit == IPC_UNIT_DEFAULT ? IPC_UNIT_KB : unit,

 			       _("max total shared memory"),

-			       lim.shmall * getpagesize(), "\n", 0);

+			       (uint64_t) lim.shmall * getpagesize(), "\n", 0);

 		ipc_print_size(unit == IPC_UNIT_DEFAULT ? IPC_UNIT_BYTES : unit,

 			       _("min seg size"), lim.shmmin, "\n", 0);

 		return;

diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c

index 62d7428..51fce7b 100644

--- a/sys-utils/ipcutils.c

+++ b/sys-utils/ipcutils.c

@@ -1,4 +1,3 @@

-

 #include <inttypes.h>

 #include "c.h"

@@ -54,8 +53,8 @@ int ipc_sem_get_limits(struct ipc_limits *lim)

 	}

-	if (rc == 4) {

-		struct seminfo seminfo;

+	if (rc != 4) {

+		struct seminfo seminfo = { .semmni = 0 };

 		union semun arg = { .array = (ushort *) &seminfo };

 		if (semctl(0, 0, IPC_INFO, arg) < 0)

@@ -82,12 +81,15 @@ int ipc_shm_get_limits(struct ipc_limits *lim)

 		lim->shmmni = path_read_u64(_PATH_PROC_IPC_SHMMNI);

 	} else {

-		struct shminfo shminfo;

+		struct shminfo *shminfo;

+		struct shmid_ds shmbuf;

-		if (shmctl(0, IPC_INFO, (struct shmid_ds *) &shminfo) < 0)

+		if (shmctl(0, IPC_INFO, &shmbuf) < 0)

 			return 1;

-		lim->shmmni = shminfo.shmmni;

-		lim->shmall = shminfo.shmall;

+		shminfo = (struct shminfo *) &shmbuf;

+		lim->shmmni = shminfo->shmmni;

+		lim->shmall = shminfo->shmall;

+		lim->shmmax = shminfo->shmmax;

 	}

 	return 0;

@@ -97,20 +99,24 @@ int ipc_shm_get_info(int id, struct shm_data **shmds)

 {

 	FILE *f;

 	int i = 0, maxid;

+	char buf[BUFSIZ];

 	struct shm_data *p;

-	struct shm_info dummy;

+	struct shmid_ds dummy;

 	p = *shmds = xcalloc(1, sizeof(struct shm_data));

 	p->next = NULL;

 	f = path_fopen("r", 0, _PATH_PROC_SYSV_SHM);

 	if (!f)

-		goto fallback;

+		goto shm_fallback;

 	while (fgetc(f) != '\n');		/* skip header */

-	while (feof(f) == 0) {

-		if (fscanf(f,

+	while (fgets(buf, sizeof(buf), f) != NULL) {

+		/* scan for the first 14-16 columns (e.g. Linux 2.6.32 has 14) */

+		p->shm_rss = 0xdead;

+		p->shm_swp = 0xdead;

+		if (sscanf(buf,

 			  "%d %d  %o %"SCNu64 " %u %u  "

 			  "%"SCNu64 " %u %u %u %u %"SCNi64 " %"SCNi64 " %"SCNi64

 			  " %"SCNu64 " %"SCNu64 "\n",

@@ -129,8 +135,8 @@ int ipc_shm_get_info(int id, struct shm_data **shmds)

 			   &p->shm_dtim,

 			   &p->shm_ctim,

 			   &p->shm_rss,

-			   &p->shm_swp) != 16)

-			continue;

+			   &p->shm_swp) < 14)

+			continue; /* invalid line, skipped */

 		if (id > -1) {

 			/* ID specified */

@@ -153,28 +159,20 @@ int ipc_shm_get_info(int id, struct shm_data **shmds)

 	return i;

 	/* Fallback; /proc or /sys file(s) missing. */

-fallback:

-	i = id < 0 ? 0 : id;

-

-	maxid = shmctl(0, SHM_INFO, (struct shmid_ds *) &dummy);

-	if (maxid < 0)

-		return 0;

+shm_fallback:

+	maxid = shmctl(0, SHM_INFO, &dummy);

-	while (i <= maxid) {

+	for (int j = 0; j <= maxid; j++) {

 		int shmid;

 		struct shmid_ds shmseg;

 		struct ipc_perm *ipcp = &shmseg.shm_perm;

-		shmid = shmctl(i, SHM_STAT, &shmseg);

-		if (shmid < 0) {

-			if (-1 < id) {

-				free(*shmds);

-				return 0;

-			}

-			i++;

+		shmid = shmctl(j, SHM_STAT, &shmseg);

+		if (shmid < 0 || (id > -1 && shmid != id)) {

 			continue;

 		}

+		i++;

 		p->shm_perm.key = ipcp->KEY;

 		p->shm_perm.id = shmid;

 		p->shm_perm.mode = ipcp->mode;

@@ -196,11 +194,12 @@ fallback:

 			p->next = xcalloc(1, sizeof(struct shm_data));

 			p = p->next;

 			p->next = NULL;

-			i++;

 		} else

-			return 1;

+			break;

 	}

+	if (i == 0)

+		free(*shmds);

 	return i;

 }

@@ -299,30 +298,22 @@ int ipc_sem_get_info(int id, struct sem_data **semds)

 	return i;

 	/* Fallback; /proc or /sys file(s) missing. */

- sem_fallback:

-	i = id < 0 ? 0 : id;

-

+sem_fallback:

 	arg.array = (ushort *) (void *)&dummy;

 	maxid = semctl(0, 0, SEM_INFO, arg);

-	if (maxid < 0)

-		return 0;

-	while (i <= maxid) {

+	for (int j = 0; j <= maxid; j++) {

 		int semid;

 		struct semid_ds semseg;

 		struct ipc_perm *ipcp = &semseg.sem_perm;

 		arg.buf = (struct semid_ds *)&semseg;

-		semid = semctl(i, 0, SEM_STAT, arg);

-		if (semid < 0) {

-			if (-1 < id) {

-				free(*semds);

-				return 0;

-			}

-			i++;

+		semid = semctl(j, 0, SEM_STAT, arg);

+		if (semid < 0 || (id > -1 && semid != id)) {

 			continue;

 		}

+		i++;

 		p->sem_perm.key = ipcp->KEY;

 		p->sem_perm.id = semid;

 		p->sem_perm.mode = ipcp->mode;

@@ -341,10 +332,12 @@ int ipc_sem_get_info(int id, struct sem_data **semds)

 			i++;

 		} else {

 			get_sem_elements(p);

-			return 1;

+			break;

 		}

 	}

+	if (i == 0)

+		free(*semds);

 	return i;

 }

@@ -398,10 +391,6 @@ int ipc_msg_get_info(int id, struct msg_data **msgds)

 		if (id > -1) {

 			/* ID specified */

 			if (id == p->msg_perm.id) {

-				/*

-				 * FIXME: q_qbytes are not in /proc

-				 *

-				 */

 				if (msgctl(id, IPC_STAT, &msgseg) != -1)

 					p->q_qbytes = msgseg.msg_qbytes;

 				i = 1;

@@ -422,27 +411,19 @@ int ipc_msg_get_info(int id, struct msg_data **msgds)

 	return i;

 	/* Fallback; /proc or /sys file(s) missing. */

- msg_fallback:

-	i = id < 0 ? 0 : id;

-

-	maxid = msgctl(id, MSG_STAT, &dummy);

-	if (maxid < 0)

-		return 0;

+msg_fallback:

+	maxid = msgctl(0, MSG_INFO, &dummy);

-	while (i <= maxid) {

+	for (int j = 0; j <= maxid; j++) {

 		int msgid;

 		struct ipc_perm *ipcp = &msgseg.msg_perm;

-		msgid = msgctl(i, MSG_STAT, &msgseg);

-		if (msgid < 0) {

-			if (-1 < id) {

-				free(*msgds);

-				return 0;

-			}

-			i++;

+		msgid = msgctl(j, MSG_STAT, &msgseg);

+		if (msgid < 0 || (id > -1 && msgid != id)) {

 			continue;

 		}

+		i++;

 		p->msg_perm.key = ipcp->KEY;

 		p->msg_perm.id = msgid;

 		p->msg_perm.mode = ipcp->mode;

@@ -463,11 +444,12 @@ int ipc_msg_get_info(int id, struct msg_data **msgds)

 			p->next = xcalloc(1, sizeof(struct msg_data));

 			p = p->next;

 			p->next = NULL;

-			i++;

 		} else

-			return 1;

+			break;

 	}

+	if (i == 0)

+		free(*msgds);

 	return i;

 }

@@ -508,10 +490,10 @@ void ipc_print_perms(FILE *f, struct ipc_stat *is)

 		fprintf(f, " %-10u\n", is->gid);

 }

-void ipc_print_size(int unit, char *msg, size_t size, const char *end,

+void ipc_print_size(int unit, char *msg, uint64_t size, const char *end,

 		    int width)

 {

-	char format[16];

+	char format[32];

 	if (!msg)

 		/* NULL */ ;

@@ -527,11 +509,11 @@ void ipc_print_size(int unit, char *msg, size_t size, const char *end,

 	switch (unit) {

 	case IPC_UNIT_DEFAULT:

 	case IPC_UNIT_BYTES:

-		sprintf(format, "%%%dzu", width);

+		sprintf(format, "%%%dju", width);

 		printf(format, size);

 		break;

 	case IPC_UNIT_KB:

-		sprintf(format, "%%%dzu", width);

+		sprintf(format, "%%%dju", width);

 		printf(format, size / 1024);

 		break;

 	case IPC_UNIT_HUMAN:

diff --git a/sys-utils/ipcutils.h b/sys-utils/ipcutils.h

index d2e5972..444065a 100644

--- a/sys-utils/ipcutils.h

+++ b/sys-utils/ipcutils.h

@@ -12,6 +12,7 @@

 #include <unistd.h>

 #include <grp.h>

 #include <pwd.h>

+#include <stdint.h>

 /*

  * SHM_DEST and SHM_LOCKED are defined in kernel headers, but inside

@@ -34,11 +35,11 @@

 # define SHM_INFO	14

 struct shm_info {

 	int used_ids;

-	ulong shm_tot;		/* total allocated shm */

-	ulong shm_rss;		/* total resident shm */

-	ulong shm_swp;		/* total swapped shm */

-	ulong swap_attempts;

-	ulong swap_successes;

+	unsigned long shm_tot;		/* total allocated shm */

+	unsigned long shm_rss;		/* total resident shm */

+	unsigned long shm_swp;		/* total swapped shm */

+	unsigned long swap_attempts;

+	unsigned long swap_successes;

 };

 #endif

@@ -118,7 +119,7 @@ struct ipc_stat {

 };

 extern void ipc_print_perms(FILE *f, struct ipc_stat *is);

-extern void ipc_print_size(int unit, char *msg, size_t size, const char *end, int width);

+extern void ipc_print_size(int unit, char *msg, uint64_t size, const char *end, int width);

 /* See 'struct shmid_kernel' in kernel sources

  */

diff --git a/sys-utils/lsipc.1 b/sys-utils/lsipc.1

new file mode 100644

index 0000000..98449cb

--- /dev/null

+++ b/sys-utils/lsipc.1

@@ -0,0 +1,133 @@

+.\" Copyright 2015 Ondrej Oprala(ooprala@redhat.com)

+.\" May be distributed under the GNU General Public License

+.TH LSIPC "1" "November 2015" "util-linux" "User Commands"

+.SH NAME

+lsipc \- show information on IPC facilities currently employed in the system

+.SH SYNOPSIS

+.B lsipc

+[options]

+.SH DESCRIPTION

+.B lsipc

+shows information on the inter-process communication facilities

+for which the calling process has read access.

+.SH OPTIONS

+.TP

+\fB\-i\fR, \fB\-\-id\fR \fIid\fR

+Show full details on just the one resource element identified by

+.IR id .

+This option needs to be combined with one of the three resource options:

+.BR \-m ,

+.BR \-q " or"

+.BR \-s .

+It is possible to override the default output format for this option with the

+\fB\-\-list\fR, \fB\-\-raw\fR, \fB\-\-json\fR or \fB\-\-export\fR option.

+.TP

+\fB\-g\fR, \fB\-\-global\fR

+Show system-wide usage and limits of IPC resources.

+This option may be combined with one of the three resource options:

+.BR \-m ,

+.BR \-q " or"

+.BR \-s .

+The default is to show information about all resources.

+.TP

+\fB\-h\fR, \fB\-\-help\fR

+Display help text and exit.

+.TP

+\fB\-V\fR, \fB\-\-version\fR

+Display version information and exit.

+.SS "Resource options"

+.TP

+\fB\-m\fR, \fB\-\-shmems\fR

+Write information about active shared memory segments.

+.TP

+\fB\-q\fR, \fB\-\-queues\fR

+Write information about active message queues.

+.TP

+\fB\-s\fR, \fB\-\-semaphores\fR

+Write information about active semaphore sets.

+.SS "Output formatting"

+.TP

+\fB\-c\fR, \fB\-\-creator\fR

+Show creator and owner.

+.TP

+\fB\-e\fR, \fB\-\-export\fR

+Output data in the format of NAME=VALUE.

+.TP

+\fB\-l\fR, \fB\-\-list\fR

+Use the list output format.  This is the default, except when \fB\-\-id\fR

+is used.

+.TP

+\fB\-n\fR, \fB\-\-newline\fR

+Display each piece of information on a separate line.

+.TP

+\fB\-\-noheadings\fR

+Do not print a header line.

+.TP

+\fB\-\-notruncate\fR

+Don't truncate output.

+.TP

+\fB\-o\fR, \fB\-\-output \fIlist\fP

+Specify which output columns to print.  Use

+.B \-\-help

+to get a list of all supported columns.

+.TP

+\fB\-p\fR, \fB\-\-pid\fR

+Show PIDs of creator and last operator.

+.TP

+\fB\-r\fR, \fB\-\-raw\fR

+Raw output (no columnation).

+.TP

+\fB\-t\fR, \fB\-\-time\fR

+Write time information.  The time of the last control operation that changed

+the access permissions for all facilities, the time of the last

+.I msgsnd()

+and

+.I msgrcv()

+operations on message queues, the time of the last

+.I shmat()

+and

+.I shmdt()

+operations on shared memory, and the time of the last

+.I semop()

+operation on semaphores.

+.TP

+\fB\-\-time\-format\fR \fItype\fP

+Display dates in short, full or iso format.  The default is short, this time

+format is designed to be space efficient and human readable.

+

+.SH EXIT STATUS

+.TP

+0

+if OK,

+.TP

+1

+if incorrect arguments specified,

+.TP

+2

+if a serious error occurs.

+.SH SEE ALSO

+.BR ipcrm (1),

+.BR ipcmk (1),

+.BR msgrcv (2),

+.BR msgsnd (2),

+.BR semget (2),

+.BR semop (2),

+.BR shmat (2),

+.BR shmdt (2),

+.BR shmget (2)

+.SH HISTORY

+The \fBlsipc\fP utility is inspired by the \fBipcs\fP utility.

+.SH AUTHORS

+.MT ooprala@redhat.com

+Ondrej Oprala

+.ME

+.br

+.MT kzak@redhat.com

+Karel Zak

+.ME

+

+.SH AVAILABILITY

+The lsipc command is part of the util-linux package and is available from

+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/

+Linux Kernel Archive

+.UE .

diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c

new file mode 100644

index 0000000..0be9d91

--- /dev/null

+++ b/sys-utils/lsipc.c

@@ -0,0 +1,1316 @@

+/*

+ * lsipc - List information about IPC instances employed in the system

+ *

+ * Copyright (C) 2015 Ondrej Oprala <ooprala@redhat.com>

+ * Copyright (C) 2015 Karel Zak <ooprala@redhat.com>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it would be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License along

+ * with this program; if not, write to the Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+ *

+ *

+ * lsipc is inspired by the ipcs utility. The aim is to create

+ * a utility unencumbered by a standard to provide more flexible

+ * means of controlling the output.

+ */

+

+#include <errno.h>

+#include <getopt.h>

+#include <sys/time.h>

+#include <unistd.h>

+

+#include <libsmartcols.h>

+

+#include "c.h"

+#include "nls.h"

+#include "closestream.h"

+#include "strutils.h"

+#include "optutils.h"

+#include "xalloc.h"

+#include "procutils.h"

+#include "ipcutils.h"

+

+/*

+ * time modes

+ * */

+enum {

+	TIME_INVALID = 0,

+	TIME_SHORT,

+	TIME_FULL,

+	TIME_ISO

+};

+

+/*

+ * IDs

+ */

+enum {

+	/* generic */

+	COLDESC_IDX_GEN_FIRST = 0,

+		COL_KEY = COLDESC_IDX_GEN_FIRST,

+		COL_ID,

+		COL_OWNER,

+		COL_PERMS,

+		COL_CUID,

+		COL_CUSER,

+		COL_CGID,

+		COL_CGROUP,

+		COL_UID,

+		COL_USER,

+		COL_GID,

+		COL_GROUP,

+		COL_CTIME,

+	COLDESC_IDX_GEN_LAST = COL_CTIME,

+

+	/* msgq-specific */

+	COLDESC_IDX_MSG_FIRST,

+		COL_USEDBYTES = COLDESC_IDX_MSG_FIRST,

+		COL_MSGS,

+		COL_SEND,

+		COL_RECV,

+		COL_LSPID,

+		COL_LRPID,

+	COLDESC_IDX_MSG_LAST = COL_LRPID,

+

+	/* shm-specific */

+	COLDESC_IDX_SHM_FIRST,

+		COL_SIZE = COLDESC_IDX_SHM_FIRST,

+		COL_NATTCH,

+		COL_STATUS,

+		COL_ATTACH,

+		COL_DETACH,

+		COL_COMMAND,

+		COL_CPID,

+		COL_LPID,

+	COLDESC_IDX_SHM_LAST = COL_LPID,

+

+	/* sem-specific */

+	COLDESC_IDX_SEM_FIRST,

+		COL_NSEMS = COLDESC_IDX_SEM_FIRST,

+		COL_OTIME,

+	COLDESC_IDX_SEM_LAST = COL_OTIME,

+

+	/* summary (--global) */

+	COLDESC_IDX_SUM_FIRST,

+		COL_RESOURCE = COLDESC_IDX_SUM_FIRST,

+		COL_DESC,

+		COL_LIMIT,