[CI] Changes needed to build the CVS version of CI.

Discussion:

Aneesh Kumar K.V

2002-10-21 03:37:39 UTC

Hi,

Attaching below is the changes needed to build the CVS version of CI.
Mostly #ifdef changes. I am not sure i am using the right #ifdef . Can
someone verify it and do the necessary checkin. ?

-aneesh

--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_init.c Thu Aug 8 05:30:57 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_init.c Mon Oct 21 22:51:34 2002
@@ -37,8 +37,8 @@
#include <cluster/clms.h>
#include <cluster/icsgen.h>
#include <cluster/ics_proto.h>
-#include <cluster/procfs.h>
#ifdef CONFIG_SSI
+#include <cluster/procfs.h>
#include <cluster/ssi/ssidev.h>
#endif /* CONFIG_SSI */
#ifdef CONFIG_MOSIX_LL
@@ -287,8 +287,10 @@
#endif
#endif /* NOTYET */

+#ifdef CONFIG_SSI /* Or should it be CONFIG_LDLVL ??*/
/* Create /proc/cluster/node# directory in /proc */
proc_cluster_init();
+#endif

#ifdef CONFIG_MOSIX_LL
init_mosix();

--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_scalls.c Sun Oct 6 12:27:06 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_scalls.c Mon Oct 21 22:37:45 2002
@@ -44,7 +44,9 @@
#include <cluster/synch.h>
#include <cluster/ssisys.h>
#include <cluster/table.h>
+#ifdef CONFIG_CFS
#include <cluster/ssi/cfs/cfs_mount.h>
+#endif

#include "ics_cluster_api_protos_gen.h"
#include "ics_cluster_api_macros_gen.h"

--- Cluster/ci-linux/ci-kernel/cluster/util/cluster_api.svc Sat Jul 13 06:52:03 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/cluster_api.svc Mon Oct 21 22:36:55 2002
@@ -36,6 +36,8 @@
param OUT int *onlinecpus
}

+#ifdef CONFIG_CFS /* Do we pass this flag when doing icsgen ? */
+
operation rcluster_get_mount NO_SIG_FORWARD {
param IN int my_node
param INOUT int *cookie
@@ -45,3 +47,4 @@
param OUT:OOL:VAR char **payload
param OUT:OOL:VAR char **dev_name
}
+#endif

Brian J. Watson

2002-10-25 20:07:04 UTC

Permalink

I'm a bit torn about the issue of SSI code existing in the CI
repository. Ideally it shouldn't be there. Any CI file touched by SSI
should exist in both repositories, with the SSI changes made to only the
SSI version.

Although this would be the purest approach, it also creates a bit of a
maintenance headache for CI. Any change made to the CI version of one of
these files must also be made to the SSI version. Ease of maintenance
argues for putting SSI specific changes into the CI repository, and
deactivating them with #ifdef CONFIG_SSI, CONFIG_CFS, etc., as Aneesh
has done.

Are there any comments on which approach would be better -- purity vs.
ease of maintenance?

-Brian

Aneesh Kumar K.V

2002-10-26 02:55:02 UTC

Permalink

Post by Brian J. Watson

I'm a bit torn about the issue of SSI code existing in the CI
repository. Ideally it shouldn't be there. Any CI file touched by SSI
should exist in both repositories, with the SSI changes made to only the
SSI version.
Although this would be the purest approach, it also creates a bit of a
maintenance headache for CI. Any change made to the CI version of one of
these files must also be made to the SSI version. Ease of maintenance
argues for putting SSI specific changes into the CI repository, and
deactivating them with #ifdef CONFIG_SSI, CONFIG_CFS, etc., as Aneesh
has done.
Are there any comments on which approach would be better -- purity vs.
ease of maintenance?
-Brian

I vote for ease of maintenance. The purity argument will be dropped if
we are planning to merge with Main Line Linux kernel :) ( I hope this
will happen )

-aneesh

Brian J. Watson

2002-10-29 20:14:01 UTC

Permalink

Laura and Dave-

These changes appear to affect your code. Are you both okay with them?

-Brian

Post by Aneesh Kumar K.V
Hi,
Attaching below is the changes needed to build the CVS version of CI.
Mostly #ifdef changes. I am not sure i am using the right #ifdef . Can
someone verify it and do the necessary checkin. ?
-aneesh
--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_init.c Thu Aug 8 05:30:57 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_init.c Mon Oct 21 22:51:34 2002
@@ -37,8 +37,8 @@
#include <cluster/clms.h>
#include <cluster/icsgen.h>
#include <cluster/ics_proto.h>
-#include <cluster/procfs.h>
#ifdef CONFIG_SSI
+#include <cluster/procfs.h>
#include <cluster/ssi/ssidev.h>
#endif /* CONFIG_SSI */
#ifdef CONFIG_MOSIX_LL
@@ -287,8 +287,10 @@
#endif
#endif /* NOTYET */
+#ifdef CONFIG_SSI /* Or should it be CONFIG_LDLVL ??*/
/* Create /proc/cluster/node# directory in /proc */
proc_cluster_init();
+#endif
#ifdef CONFIG_MOSIX_LL
init_mosix();
--- Cluster/ci-linux/ci-kernel/cluster/util/nsc_scalls.c Sun Oct 6 12:27:06 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/nsc_scalls.c Mon Oct 21 22:37:45 2002
@@ -44,7 +44,9 @@
#include <cluster/synch.h>
#include <cluster/ssisys.h>
#include <cluster/table.h>
+#ifdef CONFIG_CFS
#include <cluster/ssi/cfs/cfs_mount.h>
+#endif
#include "ics_cluster_api_protos_gen.h"
#include "ics_cluster_api_macros_gen.h"
--- Cluster/ci-linux/ci-kernel/cluster/util/cluster_api.svc Sat Jul 13 06:52:03 2002
+++ TEST/ci-linux/ci-kernel/cluster/util/cluster_api.svc Mon Oct 21 22:36:55 2002
@@ -36,6 +36,8 @@
param OUT int *onlinecpus
}
+#ifdef CONFIG_CFS /* Do we pass this flag when doing icsgen ? */
+
operation rcluster_get_mount NO_SIG_FORWARD {
param IN int my_node
param INOUT int *cookie
@@ -45,3 +47,4 @@
param OUT:OOL:VAR char **payload
param OUT:OOL:VAR char **dev_name
}
+#endif

David B. Zafman

2002-10-30 20:06:04 UTC

Permalink

The cluster_api.svc change doesn't build in an SSI kernel because although "gcc -E" is run,
the CONFIG_SSI define isn't set. The following changes work in my sandbox. I haven't
updated to 2.4.18 however. The nsc_scalls.c change is fine.

--- ../sandbox.orig/cluster/util/icsgen Wed Feb 27 17:01:23 2002
+++ cluster/util/icsgen Wed Oct 30 13:46:43 2002
@@ -1045,7 +1045,7 @@
esac
$MSG "$NAME: Generating $GEN_TEXT for service $svc to $GEN_FILE"
eval "echo $copyright" >> $OUT_FILE
- cat $IN | $CPP $DEFINES - | $GEN_SUBR >>$OUT_FILE
+ cat $IN | $CPP $DEFINES $CPPFLAGS - | $GEN_SUBR >>$OUT_FILE
if [ $? -ne 0 ]; then
echo >&2 "$NAME: error generating $GEN_TEXT to $GEN_FILE"
exit 2

--- ../sandbox.orig/cluster/util/cluster_api.svc Fri Jul 12 10:52:32 2002+++
cluster/util/cluster_api.svc Wed Oct 30 13:46:51 2002
@@ -20,6 +20,8 @@
* Questions/Comments/Bugfixes to ci-linux-***@lists.sourceforge.net
*
*/
+#include <linux/autoconf.h>
+
service cluster_api cluster_api_svc 10 20

/*
@@ -36,6 +38,8 @@
param OUT int *onlinecpus
}

+#ifdef CONFIG_CFS
+
operation rcluster_get_mount NO_SIG_FORWARD {
param IN int my_node
param INOUT int *cookie
@@ -45,3 +49,4 @@
param OUT:OOL:VAR char **payload
param OUT:OOL:VAR char **dev_name
}
+#endif

Post by Brian J. Watson
Laura and Dave-
These changes appear to affect your code. Are you both okay with them?
-Brian

-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
ci-linux-devel mailing list
https://lists.sourceforge.net/lists/listinfo/ci-linux-devel

--
David B. Zafman | Hewlett-Packard Company
mailto:***@hp.com | http://www.hp.com
"Thus spake the master programmer: When you have learned to snatch
the error code from the trap frame, it will be time for you to leave."

John Byrne

2002-10-30 20:11:02 UTC

Permalink

Post by David B. Zafman
The cluster_api.svc change doesn't build in an SSI kernel because although "gcc -E" is run,
the CONFIG_SSI define isn't set. The following changes work in my sandbox. I haven't
updated to 2.4.18 however. The nsc_scalls.c change is fine.
--- ../sandbox.orig/cluster/util/icsgen Wed Feb 27 17:01:23 2002
+++ cluster/util/icsgen Wed Oct 30 13:46:43 2002
@@ -1045,7 +1045,7 @@
esac
$MSG "$NAME: Generating $GEN_TEXT for service $svc to $GEN_FILE"
eval "echo $copyright" >> $OUT_FILE
- cat $IN | $CPP $DEFINES - | $GEN_SUBR >>$OUT_FILE
+ cat $IN | $CPP $DEFINES $CPPFLAGS - | $GEN_SUBR >>$OUT_FILE
if [ $? -ne 0 ]; then
echo >&2 "$NAME: error generating $GEN_TEXT to $GEN_FILE"
exit 2

I've checked in a slightly different fix for this as a part of my 2.4.18
merge.

Post by David B. Zafman
--- ../sandbox.orig/cluster/util/cluster_api.svc Fri Jul 12 10:52:32 2002+++
cluster/util/cluster_api.svc Wed Oct 30 13:46:51 2002
@@ -20,6 +20,8 @@
*
*/
+#include <linux/autoconf.h>
+
service cluster_api cluster_api_svc 10 20
/*
@@ -36,6 +38,8 @@
param OUT int *onlinecpus
}
+#ifdef CONFIG_CFS
+
operation rcluster_get_mount NO_SIG_FORWARD {
param IN int my_node
param INOUT int *cookie
@@ -45,3 +49,4 @@
param OUT:OOL:VAR char **payload
param OUT:OOL:VAR char **dev_name
}
+#endif

It needs to be CONFIG_SSI.

Post by David B. Zafman

Post by Brian J. Watson
Laura and Dave-
These changes appear to affect your code. Are you both okay with them?
-Brian

--
David B. Zafman | Hewlett-Packard Company
"Thus spake the master programmer: When you have learned to snatch
the error code from the trap frame, it will be time for you to leave."
-------------------------------------------------------
This sf.net email is sponsored by: Influence the future
of Java(TM) technology. Join the Java Community
Process(SM) (JCP(SM)) program now.
http://ads.sourceforge.net/cgi-bin/redirect.pl?sunm0004en
_______________________________________________
ci-linux-devel mailing list
https://lists.sourceforge.net/lists/listinfo/ci-linux-devel

Aneesh Kumar K.V

2002-10-31 02:29:02 UTC

Permalink

Post by John Byrne

[....snip....]

Post by John Byrne

Post by David B. Zafman
operation rcluster_get_mount NO_SIG_FORWARD {
param IN int my_node
param INOUT int *cookie
@@ -45,3 +49,4 @@
param OUT:OOL:VAR char **payload
param OUT:OOL:VAR char **dev_name
}
+#endif

It needs to be CONFIG_SSI.

Is this ok if i want to build SSI without CFS ?

-aneesh

David B. Zafman

2002-10-31 15:45:02 UTC

Permalink

Yes, actually the rcluser_get_mount RPC is used other filesystems, not just CFS.

Post by Aneesh Kumar K.V

Post by John Byrne

[....snip....]

Post by John Byrne

It needs to be CONFIG_SSI.

Is this ok if i want to build SSI without CFS ?
-aneesh
-------------------------------------------------------
This sf.net email is sponsored by: Influence the future
of Java(TM) technology. Join the Java Community
Process(SM) (JCP(SM)) program now.
http://ads.sourceforge.net/cgi-bin/redirect.pl?sunm0004en
_______________________________________________
ci-linux-devel mailing list
https://lists.sourceforge.net/lists/listinfo/ci-linux-devel

Laura Ramirez

2002-10-29 20:22:09 UTC

Permalink

I have no problem with the procfs changes.

laura

Post by Brian J. Watson
Laura and Dave-
These changes appear to affect your code. Are you both okay with them?
-Brian