sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] cmpi-network/contrib SuSEconfig.sblim-cmpi-network,1.1,NONE sblim-cmpi-network.spec,1.3,NONE

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-network/contrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2066/contrib

Removed Files:
	SuSEconfig.sblim-cmpi-network sblim-cmpi-network.spec 
Log Message:
bug# 1183805: autoconfiscate all provider packages - cmpi-network done


--- SuSEconfig.sblim-cmpi-network DELETED ---

--- sblim-cmpi-network.spec DELETED ---

[Sblim-commit] cmpi-fsvol AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 Makefile.am,NONE,1.1 NEWS,NONE,1.1 README.TEST,NONE,1.1 acinclude.m4,NONE,1.1 autoconfiscate.sh,NONE,1.1 configure.ac,NONE,1.1 provider-register.sh,NONE,1.1 sblim-cmpi-fsvol.spec.in,NONE,1.1 README,1.5,1.6 CHANGE.LOG,1.4,NONE license.html,1.1,NONE makefile,1.9,NONE setting.cmpi,1.9,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867

Modified Files:
	README 
Added Files:
	AUTHORS COPYING ChangeLog Makefile.am NEWS README.TEST 
	acinclude.m4 autoconfiscate.sh configure.ac 
	provider-register.sh sblim-cmpi-fsvol.spec.in 
Removed Files:
	CHANGE.LOG license.html makefile setting.cmpi 
Log Message:
Bug 1179169: Autoconfiscation with dependency on cmpi-base and optional
testsuite support.


--- NEW FILE: ChangeLog ---


// ===================================================================
// new in version 1.2.4 :

* update to Pegasus' CIMOMINC path in setting.cmpi

* support for standalone build (RPM)

// ===================================================================
// new in version 1.2.5 :

* fixed memory leak in delete function for mntent structures

* test script accepts userID and password

// ===================================================================
// new in version 1.3 :

* support for property list filter on EnumInstances and GetInstance

// ===================================================================

--- CHANGE.LOG DELETED ---

--- NEW FILE: AUTHORS ---
The cmpi-base provider package was originally written by Heidi Neumann 
<hei...@de...>.

--- makefile DELETED ---

--- NEW FILE: configure.ac ---
#                                               -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
AC_INIT(SBLIM BaseOS Filesystem Providers, 1.2.6am, sbl...@li...,sblim-cmpi-fsvol)
AC_CONFIG_SRCDIR([OSBase_CommonFsvol.c])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE

AC_CANONICAL_HOST
case $host_cpu in
     i*86) HW=INTEL;; 
     s390*) HW=S390;; 
     ppc*) HW=PPC;; 
     x86_64) HW=X86_64;; 
     ia64) HW=IA64;; 
     **) HW=GENERIC;;
esac

# Configuration Arguments
AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite resides.])
AC_ARG_VAR([PROVIDERDIR],[the directory where the CMPI providers will be installed.])
AC_ARG_VAR([CIMSERVER],[the target CIM server (pegasus|sfcb|openwbem|sniacimom).])

# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LIBTOOL

# Check for required CMPI header files (defined in acinclude.m4)
CHECK_CMPI

# Check for required libraries (defined in acinclude.m4)
CHECK_PROVIDERDIR

# Check for CIM Server (defined in acinclude.m4)
CHECK_CIMSERVER

# Check for SBLIM Base
CHECK_SBLIM_BASE

# Check for SBLIM Testsuite
CHECK_TESTSUITE

# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([fcntl.h mntent.h stdint.h stdlib.h string.h sys/vfs.h unistd.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

# Checks for library functions.
AC_FUNC_GETMNTENT
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_CHECK_FUNCS([getmntent hasmntopt memset strcasecmp strchr strdup strncasecmp strstr])

AC_CONFIG_FILES([Makefile sblim-cmpi-fsvol.spec])

if test x"$TESTSUITEDIR" == x; then
   TESTSUITE_SUPPORT=Disabled
else	
   TESTSUITE_SUPPORT=Enabled
fi
# Display configuration options
echo "-------------------------------------------------------"
echo "Configuration for $PACKAGE complete."
echo ""
echo "The following configuration options have been selected:"
echo "CIMSERVER: " $CIMSERVER
echo "PROVIDERDIR: " $PROVIDERDIR
echo "CPPFLAGS:" $CPPFLAGS
echo "Test Suite Support" $TESTSUITE_SUPPORT
if test x"$TESTSUITEDIR" != x; then
echo "TESTSUITEDIR " $TESTSUITEDIR
fi
echo "-------------------------------------------------------"

AC_OUTPUT

echo "You may now run make"

--- NEW FILE: acinclude.m4 ---
dnl
dnl $Id: acinclude.m4,v 1.1 2005/04/15 14:28:15 mihajlov Exp $
dnl
 dnl 
 dnl (C) Copyright IBM Corp. 2004, 2005
 dnl
 dnl THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
 dnl ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
 dnl CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
 dnl
 dnl You can obtain a current copy of the Common Public License from
 dnl  http://www.opensource.org/licenses/cpl1.0.php
 dnl
 dnl Author:       Konrad Rzeszutek <ko...@us...>
 dnl Contributors: Viktor Mihajlovski <mih...@de...>
 dnl Date  :	      09/20/2004
dnl
dnl
dnl CHECK_CMPI: Check for CMPI headers and set the CPPFLAGS
dnl with the -I<directory>
dnl 
dnl CHECK_PEGASUS_2_3_2: Check for Pegasus 2.3.2 and set
dnl the HAVE_PEGASUS_2_3_2 
dnl flag 
dnl

AC_DEFUN([CHECK_PEGASUS_2_3_2],
	[
	AC_MSG_CHECKING(for Pegasus 2.3.2)
	test_CIMSERVER=`cimserver -v`
	if test "$test_CIMSERVER" == "2.3.2"; then
		AC_MSG_RESULT(yes)		
		AC_DEFINE_UNQUOTED(HAVE_PEGASUS_2_3_2,1,[Defined to 1 if Pegasus 2.3.2 is used])
	else
		AC_MSG_RESULT(no)

	fi
	]
)

dnl
dnl CHECK_PEGASUS_2_4: Check for Pegasus 2.4 and set the
dnl the -DPEGASUS_USE_EXPERIMENTAL_INTERFACES flag
dnl
AC_DEFUN([CHECK_PEGASUS_2_4],
	[
	AC_MSG_CHECKING(for Pegasus 2.4)
	test_CIMSERVER=`cimserver -v`
	if test "$test_CIMSERVER" == "2.4"; then
		AC_MSG_RESULT(yes)		
		CPPFLAGS="$CPPFLAGS -DPEGASUS_USE_EXPERIMENTAL_INTERFACES"
		AC_DEFINE_UNQUOTED(HAVE_PEGASUS_2_4,1,[Defined to 1 if Pegasus 2.4 is used])
	else
		AC_MSG_RESULT(no)

	fi
	]
)
	
	
dnl
dnl Helper functions
dnl
AC_DEFUN([_CHECK_CMPI],
	[
	AC_MSG_CHECKING($1)
	AC_TRY_LINK(
	[
		#include <cmpimacs.h>
		#include <cmpidt.h>
		#include <cmpift.h>
	],
	[
		CMPIBroker broker;
		CMPIStatus status = {CMPI_RC_OK, NULL};
		CMPIString *s = CMNewString(&broker, "TEST", &status);
	],
	[
		have_CMPI=yes
		dnl AC_MSG_RESULT(yes)
	],
	[
		have_CMPI=no
		dnl AC_MSG_RESULT(no)
	])

])

AC_DEFUN([_CHECK_SBLIM_BASE],
	[
	AC_MSG_CHECKING($1)
	_ldflags=$LDFLAGS
	LDFLAGS="$LDFLAGS -lcmpiOSBase_Common"
	AC_TRY_LINK(
	[
		#include <OSBase_Common.h>
	],
	[
	        get_system_name();
	],
	[
		have_SBLIMBASE=yes
	        LDFLAGS=$_ldflags
		dnl AC_MSG_RESULT(yes)
	],
	[
		have_SBLIMBASE=no
	        LDFLAGS=$_ldflags
		dnl AC_MSG_RESULT(no)
	])

])

dnl
dnl The main function to check for CMPI headers
dnl Modifies the CPPFLAGS with the right include directory and sets
dnl the 'have_CMPI' to either 'no' or 'yes'
dnl

AC_DEFUN([CHECK_CMPI],
	[
	AC_MSG_CHECKING(for CMPI headers)
        CMPI_CPP_FLAGS="$CPPFLAGS"
	dnl Check just with the standard include paths
	_CHECK_CMPI(standard)
	if test "$have_CMPI" == "yes"; then
		dnl The standard include paths worked.
		AC_MSG_RESULT(yes)
	else
	  _DIRS_="/usr/include/cmpi \
                  /usr/local/include/cmpi \
		  $PEGASUS_ROOT/src/Pegasus/Provider/CMPI \
		  /opt/tog-pegasus/include/Pegasus/Provider/CMPI \
		  /usr/include/Pegasus/Provider/CMPI \
		  /usr/include/openwbem \
		  /usr/sniacimom/include"
	  for _DIR_ in $_DIRS_
	  do
		 _cppflags=$CPPFLAGS
		 _include_CMPI="$_DIR_"
		 CPPFLAGS="$CPPFLAGS -I$_include_CMPI"
		 _CHECK_CMPI($_DIR_)
		 if test "$have_CMPI" == "yes"; then
		  	dnl Found it
		  	AC_MSG_RESULT(yes)
			dnl Save the new -I parameter  
			CMPI_CPP_FLAGS="$CPPFLAGS"
			break
		 fi
	         CPPFLAGS=$_cppflags
	  done
	fi	
	CPPFLAGS="$CMPI_CPP_FLAGS"	
	if test "$have_CMPI" == "no"; then
		AC_MSG_ERROR(no. Sorry cannot find CMPI headers files.)
	fi
	]
)

dnl
dnl The main function to check for the cmpi-base common header
dnl Modifies the CPPFLAGS with the right include directory and sets
dnl the 'have_SBLIMBASE' to either 'no' or 'yes'
dnl

AC_DEFUN([CHECK_SBLIM_BASE],
	[
	AC_MSG_CHECKING(for SBLIM Base)
        SBLIMBASE_CPP_FLAGS="$CPPFLAGS"
	dnl Check just with the standard include paths
	_CHECK_SBLIM_BASE(standard)
	if test "$have_SBLIMBASE" == "yes"; then
		dnl The standard include paths worked.
		AC_MSG_RESULT(yes)
	else
	  _DIRS_="/usr/include/sblim \
                  /usr/local/include/sblim"
	  for _DIR_ in $_DIRS_
	  do
		 _cppflags=$CPPFLAGS
		 _include_SBLIMBASE="$_DIR_"
		 CPPFLAGS="$CPPFLAGS -I$_include_SBLIMBASE"
		 _CHECK_SBLIM_BASE($_DIR_)
		 if test "$have_SBLIMBASE" == "yes"; then
		  	dnl Found it
		  	AC_MSG_RESULT(yes)
			dnl Save the new -I parameter  
			SBLIMBASE_CPP_FLAGS="$CPPFLAGS"
			LIBSBLIMBASE=-lcmpiOSBase_Common	
			break
		 fi
	         CPPFLAGS=$_cppflags
	  done
	fi	
	CPPFLAGS=$SBLIMBASE_CPP_FLAGS
	AC_SUBST(LIBSBLIMBASE)
	if test "$have_SBLIMBASE" == "no"; then
		AC_MSG_ERROR(no. The required SBLIM Base package is missing.)
        fi
	]
)

dnl
dnl The check for the CMPI provider directory
dnl Sets the PROVIDERDIR  variable.
dnl

AC_DEFUN([CHECK_PROVIDERDIR],
	[
	AC_MSG_CHECKING(for CMPI provider directory)
	_DIRS="$libdir/cmpi"
	for _dir in $_DIRS
	do
		AC_MSG_CHECKING( $_dir )
		if test -d $_dir ; then
		  dnl Found it
		  AC_MSG_RESULT(yes)
		  if test x"$PROVIDERDIR" == x ; then
			PROVIDERDIR=$_dir
		  fi
		  break
		fi
        done
	if test x"$PROVIDERDIR" == x ; then
		PROVIDERDIR="$libdir"/cmpi
		AC_MSG_RESULT(implied: $PROVIDERDIR)
	fi
	]
)

dnl
dnl The "check" for the CIM server type
dnl Sets the CIMSERVER variable.
dnl

AC_DEFUN([CHECK_CIMSERVER],
	[
	AC_MSG_CHECKING(for CIM servers)
	_SERVERS="sfcbd cimserver owcimomd"
	for _name in $_SERVERS
	do
	 	AC_MSG_CHECKING( $_name )
	        which $_name > /dev/null 2>&1
		if test $? == 0 ; then
		  dnl Found it
		  AC_MSG_RESULT(yes)
		  if test x"$CIMSERVER" == x ; then
			case $_name in
			   sfcbd) CIMSERVER=sfcb;;
			   cimserver) CIMSERVER=pegasus;;
			   owcimomd) CIMSERVER=openwbem;;
			esac
		  fi
		  break;
		fi
        done
	if test x"$CIMSERVER" == x ; then
		CIMSERVER=sfcb
		AC_MSG_RESULT(implied: $CIMSERVER)
	fi
	]
)

dnl
dnl The check for the SBLIM test suite
dnl Sets the TESTSUITEDIR variable and the TESTSUITE conditional
dnl

AC_DEFUN([CHECK_TESTSUITE],
	[
	AC_MSG_CHECKING(for SBLIM testsuite)
	_DIRS="$datadir/sblim-testsuite"
	save_exec_prefix=${exec_prefix}
	save_prefix=${prefix}
	if test xNONE == x${prefix}; then
		prefix=/usr/local
	fi
	if test xNONE == x${exec_prefix}; then
		exec_prefix=$prefix
	fi
	for _name in $_DIRS
	do
	 	AC_MSG_CHECKING( $_name )
		_xname=`eval echo $_name`
		if test -x $_xname/run.sh ; then
		  dnl Found it
		  AC_MSG_RESULT(yes)
		  if test x"$TESTSUITEDIR" == x; then
		  	TESTSUITEDIR=$_name
		  fi
		  AC_SUBST(TESTSUITEDIR)
		  break;
		fi
        done
	if test x"$TESTSUITEDIR" == x ; then
		AC_MSG_RESULT(no)
	fi
	AM_CONDITIONAL(TESTSUITE,[test x"$TESTSUITEDIR" != x])
	exec_prefix=$save_exec_prefix
	prefix=$save_prefix
	]
)


--- license.html DELETED ---

--- NEW FILE: README.TEST ---
Test Environment for SBLIM Fsvol Instrumentation

The SBLIM project offers a Test Suite to perform tests against
the provider implementation and consistence tests against system
values.

Prerequisites 
.............

- sblim-cmpi-fsvol package propertly installed
- testsuite package


Pepare Test
...........

done automatically during configure


Install Configuration Files
...........................

done during make install


Run Test
........

Run the test in the testsuite directory (typically /usr/share/sblim-testsuite)
by executing 
. test-cmpi-fsvol.sh
echo Status: $SBLIM_TESTSUITE_RUN

--- NEW FILE: sblim-cmpi-fsvol.spec.in ---
#
# $Id: sblim-cmpi-fsvol.spec.in,v 1.1 2005/04/15 14:28:15 mihajlov Exp $
#
# Package spec for @PACKAGE@
#

BuildRoot: /var/tmp/buildroot

Summary: SBLIM FSVOL Instrumentation
Name: @PACKAGE_TARNAME@
Version: @PACKAGE_VERSION@
Release: @CIMSERVER@
Group: Systems Management/Base
License: Common Public License 1.0

Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2

BuildRequires: cmpi-devel
BuildRequires: sblim-cmpi-base-devel

Requires: cimserver sblim-cmpi-base

%Description
Standards Based Linux Instrumentation File System and Storage Volume Providers

%Package devel
Summary: SBLIM FSVOL Instrumentation Header Development Files
Group: Systems Management/Base
Requires: %{name} = %{version}

%Description devel
SBLIM Base FSVOL Development Package

%Package test
Summary: SBLIM FSVOL Instrumentation Testcases
Group: Systems Management/Base
Requires: %{name} = %{version}
Requires: sblim-testsuite

%Description test
SBLIM Base FSVOL Testcase Files for SBLIM Testsuite

%prep

%setup -n %{name}-%{version}

export PATCH_GET=0

#%patch0 -p0

%build

%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite
make

%clean

if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi

%install

if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi

make DESTDIR=$RPM_BUILD_ROOT install

# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a

%post
# Register Schema and Provider - this is higly provider specific

%define SCHEMA %{_datadir}/%{name}/Linux_Fsvol.mof
%define REGISTRATION_pegasus %{_datadir}/%{name}/Linux_FsvolRegister.mof
%define REGISTRATION_sfcb %{_datadir}/%{name}/Linux_Fsvol.sfcb.reg 


%{_datadir}/%{name}/provider-register.sh -t @CIMSERVER@ \
	-s %{SCHEMA} > /dev/null

%{_datadir}/%{name}/provider-register.sh -t @CIMSERVER@ \
	-r %{REGISTRATION_@CIMSERVER@} > /dev/null

/sbin/ldconfig

%postun
/sbin/ldconfig

%files

%defattr(-,root,root) 
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so*
%{_libdir}/cmpi/*.so*


%files devel

%defattr(-,root,root)
%{_includedir}

%files test

%defattr(-,root,root)
%{_datadir}/sblim-testsuite


--- NEW FILE: COPYING ---
Common Public License Version 1.0

THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

1. DEFINITIONS

"Contribution" means:

    a) in the case of the initial Contributor, the initial code and
documentation distributed under this Agreement, and

    b) in the case of each subsequent Contributor:

    i) changes to the Program, and

    ii) additions to the Program;

    where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from a
Contributor if it was added to the Program by such Contributor itself or anyone
acting on such Contributor's behalf. Contributions do not include additions to
the Program which: (i) are separate modules of software distributed in
conjunction with the Program under their own license agreement, and (ii) are not
derivative works of the Program.

"Contributor" means any person or entity that distributes the Program.

"Licensed Patents " mean patent claims licensable by a Contributor which are
necessarily infringed by the use or sale of its Contribution alone or when
combined with the Program.

"Program" means the Contributions distributed in accordance with this Agreement.

"Recipient" means anyone who receives the Program under this Agreement,
including all Contributors.

2. GRANT OF RIGHTS

    a) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free copyright license to
reproduce, prepare derivative works of, publicly display, publicly perform,
distribute and sublicense the Contribution of such Contributor, if any, and such
derivative works, in source code and object code form.

    b) Subject to the terms of this Agreement, each Contributor hereby grants
Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
Patents to make, use, sell, offer to sell, import and otherwise transfer the
Contribution of such Contributor, if any, in source code and object code form.
This patent license shall apply to the combination of the Contribution and the
Program if, at the time the Contribution is added by the Contributor, such
addition of the Contribution causes such combination to be covered by the
Licensed Patents. The patent license shall not apply to any other combinations
which include the Contribution. No hardware per se is licensed hereunder.

    c) Recipient understands that although each Contributor grants the licenses
to its Contributions set forth herein, no assurances are provided by any
Contributor that the Program does not infringe the patent or other intellectual
property rights of any other entity. Each Contributor disclaims any liability to
Recipient for claims brought by any other entity based on infringement of
intellectual property rights or otherwise. As a condition to exercising the
rights and licenses granted hereunder, each Recipient hereby assumes sole
responsibility to secure any other intellectual property rights needed, if any.
For example, if a third party patent license is required to allow Recipient to
distribute the Program, it is Recipient's responsibility to acquire that license
before distributing the Program.

    d) Each Contributor represents that to its knowledge it has sufficient
copyright rights in its Contribution, if any, to grant the copyright license set
forth in this Agreement.

3. REQUIREMENTS

A Contributor may choose to distribute the Program in object code form under its
own license agreement, provided that:

    a) it complies with the terms and conditions of this Agreement; and

    b) its license agreement:

    i) effectively disclaims on behalf of all Contributors all warranties and
conditions, express and implied, including warranties or conditions of title and
non-infringement, and implied warranties or conditions of merchantability and
fitness for a particular purpose;

    ii) effectively excludes on behalf of all Contributors all liability for
damages, including direct, indirect, special, incidental and consequential
damages, such as lost profits;

    iii) states that any provisions which differ from this Agreement are offered
by that Contributor alone and not by any other party; and

    iv) states that source code for the Program is available from such
Contributor, and informs licensees how to obtain it in a reasonable manner on or
through a medium customarily used for software exchange. 

When the Program is made available in source code form:

    a) it must be made available under this Agreement; and

    b) a copy of this Agreement must be included with each copy of the Program. 

Contributors may not remove or alter any copyright notices contained within the
Program.

Each Contributor must identify itself as the originator of its Contribution, if
any, in a manner that reasonably allows subsequent Recipients to identify the
originator of the Contribution.

4. COMMERCIAL DISTRIBUTION

Commercial distributors of software may accept certain responsibilities with
respect to end users, business partners and the like. While this license is
intended to facilitate the commercial use of the Program, the Contributor who
includes the Program in a commercial product offering should do so in a manner
which does not create potential liability for other Contributors. Therefore, if
a Contributor includes the Program in a commercial product offering, such
Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
every other Contributor ("Indemnified Contributor") against any losses, damages
and costs (collectively "Losses") arising from claims, lawsuits and other legal
actions brought by a third party against the Indemnified Contributor to the
extent caused by the acts or omissions of such Commercial Contributor in
connection with its distribution of the Program in a commercial product
offering. The obligations in this section do not apply to any claims or Losses
relating to any actual or alleged intellectual property infringement. In order
to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
Contributor in writing of such claim, and b) allow the Commercial Contributor to
control, and cooperate with the Commercial Contributor in, the defense and any
related settlement negotiations. The Indemnified Contributor may participate in
any such claim at its own expense.

For example, a Contributor might include the Program in a commercial product
offering, Product X. That Contributor is then a Commercial Contributor. If that
Commercial Contributor then makes performance claims, or offers warranties
related to Product X, those performance claims and warranties are such
Commercial Contributor's responsibility alone. Under this section, the
Commercial Contributor would have to defend claims against the other
Contributors related to those performance claims and warranties, and if a court
requires any other Contributor to pay any damages as a result, the Commercial
Contributor must pay those damages.

5. NO WARRANTY

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
Recipient is solely responsible for determining the appropriateness of using and
distributing the Program and assumes all risks associated with its exercise of
rights under this Agreement, including but not limited to the risks and costs of
program errors, compliance with applicable laws, damage to or loss of data,
programs or equipment, and unavailability or interruption of operations.

6. DISCLAIMER OF LIABILITY

EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

7. GENERAL

If any provision of this Agreement is invalid or unenforceable under applicable
law, it shall not affect the validity or enforceability of the remainder of the
terms of this Agreement, and without further action by the parties hereto, such
provision shall be reformed to the minimum extent necessary to make such
provision valid and enforceable.

If Recipient institutes patent litigation against a Contributor with respect to
a patent applicable to software (including a cross-claim or counterclaim in a
lawsuit), then any patent licenses granted by that Contributor to such Recipient
under this Agreement shall terminate as of the date such litigation is filed. In
addition, if Recipient institutes patent litigation against any entity
(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
itself (excluding combinations of the Program with other software or hardware)
infringes such Recipient's patent(s), then such Recipient's rights granted under
Section 2(b) shall terminate as of the date such litigation is filed.

All Recipient's rights under this Agreement shall terminate if it fails to
comply with any of the material terms or conditions of this Agreement and does
not cure such failure in a reasonable period of time after becoming aware of
such noncompliance. If all Recipient's rights under this Agreement terminate,
Recipient agrees to cease use and distribution of the Program as soon as
reasonably practicable. However, Recipient's obligations under this Agreement
and any licenses granted by Recipient relating to the Program shall continue and
survive.

Everyone is permitted to copy and distribute copies of this Agreement, but in
order to avoid inconsistency the Agreement is copyrighted and may only be
modified in the following manner. The Agreement Steward reserves the right to
publish new versions (including revisions) of this Agreement from time to time.
No one other than the Agreement Steward has the right to modify this Agreement.
IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
as the Agreement Steward to a suitable separate entity. Each new version of the
Agreement will be given a distinguishing version number. The Program (including
Contributions) may always be distributed subject to the version of the Agreement
under which it was received. In addition, after a new version of the Agreement
is published, Contributor may elect to distribute the Program (including its
Contributions) under the new version. Except as expressly stated in Sections
2(a) and 2(b) above, Recipient receives no rights or licenses to the
intellectual property of any Contributor under this Agreement, whether
expressly, by implication, estoppel or otherwise. All rights in the Program not
expressly granted under this Agreement are reserved.

This Agreement is governed by the laws of the State of New York and the
intellectual property laws of the United States of America. No party to this
Agreement will bring a legal action under this Agreement more than one year
after the cause of action arose. Each party waives its rights to a jury trial in
any resulting litigation.

--- setting.cmpi DELETED ---

Index: README
===================================================================
RCS file: /cvsroot/sblim/cmpi-fsvol/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README	23 Mar 2004 10:41:16 -0000	1.5
+++ README	15 Apr 2005 14:28:15 -0000	1.6
@@ -53,7 +53,7 @@
 Prerequisites
 .............
 - CIMOM is installed
-- CMPI (package cmpi-adapter) latest version
+- CMPI (for instance package cmpi-devel) latest version
 - CIM Schema Version 2.7 and higher loaded into the CIMOM's
   repository
 - cmpi-base package installed
@@ -71,19 +71,28 @@
 
 Building cmpi-fsvol
 ...................
-In order to compile and install cmpi-fsvol instrumentation, 
-the path to the CMPI/cmpi-base header files and the library 
-path to libCMPIAdapter.so needs to be added to the search path. 
-This is configured by editing the "setting.cmpi" file. Once
-all the pathes are configured, do :
-- make
-- make install	-> copy all shared libraries to the library
-		   path of the CIMOM; copy some header files
-		   to the inlcude path (necessary if other
-		   instrumentation packages use tool functions
-		   of cmpi-fsvol)
+named INSTALL for generic instructions.
+
+The generated configure script tries to determine where the CMPI header files
+are located. For this purpose it searches a set of well-known locations.
+The "canonical" location is /usr/include/cmpi or /usr/local/include/cmpi,
+depending on how configure is invoked.
+
+Further, configure "determines" where providers are to be installed. Actually,
+there's no detection logic. The provider directory will always be
+/usr/lib/cmpi or /usr/local/lib/cmpi. If a CIM server requires a particular
+directory this can be selected by specifying the PROVIDERDIR variable.
+
+And finally, configure tries to find out which CIM server type is being used.
+This is necessary in order to select the appropriate schema and provider
+registration technique. If the CIM server is not or incorrectly identified,
+it is possible to specify it via the CIMSERVER variable.
+Supported values are pegasus, sfcb, openwbem and sniacimom.
+
+For instance, in order to configure for a locally installed Pegasus you can
+issue the following command:
+./configure CIMSERVER=pegasus PROVIDERDIR=$PEGASUS_HOME/lib
 
-- make clean	-> to delete all shared libs in this source
 		   directory
 
 Load Schema into CIMOM's repository
@@ -92,7 +101,7 @@
 with Pegasus :
 ..............
 The loading and registering of the classes/associations and
-their provider is done during the "make install" process.
+their provider is done during the "make postinstall".
 
 with OpenCimom/SNIA CIMOM :
 ...........................
@@ -149,4 +158,4 @@
 of providers. 
 
 How to set up and drive the test is described in the 
-README file of the test sub directory.
+README.TEST file.

--- NEW FILE: NEWS ---

--- NEW FILE: autoconfiscate.sh ---
#!/bin/sh
#
# Script to setup autoconf/automake build environment.
# Run this first to create the configure script
aclocal --force &&
autoheader --force &&
libtoolize --force && 
automake --add-missing --force-missing &&
autoconf --force &&
echo "You may now run ./configure"

--- NEW FILE: Makefile.am ---
# $Id: Makefile.am,v 1.1 2005/04/15 14:28:15 mihajlov Exp $
# ==================================================================
# (C) Copyright IBM Corp. 2005
#
# THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
# ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
# CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
#
# You can obtain a current copy of the Common Public License from
# http://www.opensource.org/licenses/cpl1.0.php
#
# Author:       Viktor Mihajlovski <mih...@de...>
# Contributors: Dr. Gareth S. Bestor <bes...@us...>
# Description:  Automake input file for OS Base Providers
# ==================================================================


# SBLIM Include Directory
sblimincdir = $(includedir)/sblim

# Start from an empty extra distribution file list
EXTRA_DIST=

# docdir defines where the documentation goes
docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)

#
# Automake instructions for documentation
#
doc_DATA=README AUTHORS COPYING 

# ADD EXTRA DOC FILES IF PRESENT
doc_DATA+=DEBUG
EXTRA_DIST+=DEBUG

# providerdir defines where provider libraries will be installed (@PROVIDERDIR@ is set by the configure script). 
providerdir = @PROVIDERDIR@

#
# Automake instructions for main dir
#

#  OSBase CMPI provider libraries
provider_LTLIBRARIES = 	libcmpiOSBase_LocalFileSystemProvider.la \
			libcmpiOSBase_NFSProvider.la \
			libcmpiOSBase_HostedFileSystemProvider.la \
			libcmpiOSBase_BootOSFromFSProvider.la 

# Local Filesystem
libcmpiOSBase_LocalFileSystemProvider_la_SOURCES = \
		cmpiOSBase_LocalFileSystemProvider.c \
		cmpiOSBase_LocalFileSystem.c \
		OSBase_LocalFileSystem.c
libcmpiOSBase_LocalFileSystemProvider_la_LIBADD = \
		-lcmpiOSBase_CommonFsvol 

# Network Filesystem
libcmpiOSBase_NFSProvider_la_SOURCES = \
		cmpiOSBase_NFSProvider.c \
		cmpiOSBase_NFS.c \
		OSBase_NFS.c
libcmpiOSBase_NFSProvider_la_LIBADD = \
		-lcmpiOSBase_CommonFsvol

# Hosted Filesystem (Association)
libcmpiOSBase_HostedFileSystemProvider_la_SOURCES = \
		cmpiOSBase_HostedFileSystemProvider.c
libcmpiOSBase_HostedFileSystemProvider_la_LIBADD = \
		-lcmpiOSBase_CommonFsvol

# Boot OS from Filesystem (Association)
libcmpiOSBase_BootOSFromFSProvider_la_SOURCES = \
		cmpiOSBase_BootOSFromFSProvider.c \
		cmpiOSBase_BootOSFromFS.c 
libcmpiOSBase_BootOSFromFSProvider_la_LIBADD = \
		-lcmpiOSBase_CommonFsvol

# OSBase support utility libraries
lib_LTLIBRARIES = libcmpiOSBase_CommonFsvol.la

libcmpiOSBase_CommonFsvol_la_SOURCES=OSBase_CommonFsvol.c \
		cmpiOSBase_CommonFsvol.c
libcmpiOSBase_CommonFsvol_la_LIBADD=@LIBSBLIMBASE@

# Installable Header Files
sbliminc_HEADERS = OSBase_CommonFsvol.h cmpiOSBase_CommonFsvol.h

# Non-Installable Header Files
noinst_HEADERS = OSBase_LocalFileSystem.h \
	OSBase_NFS.h \
	cmpiOSBase_LocalFileSystem.h \
	cmpiOSBase_NFS.h \
	cmpiOSBase_BootOSFromFS.h

# We must explicity add the RPM spec file to the distribution package
EXTRA_DIST+=$(PACKAGE).spec

#
# Automake instructions for ./mof subdir
#
SCHEMAS=mof/Linux_Fsvol.mof 
REGISTRATIONS.pegasus=mof/Linux_FsvolRegister.mof 
REGISTRATIONS.sfcb=mof/Linux_Fsvol.sfcb.reg 
REGISTRATIONS.openwbem=
REGISTRATIONS.sniacimom=

REGISTRATIONS=$(REGISTRATIONS.pegasus) \
		$(REGISTRATIONS.sfcb) \
		$(REGISTRATIONS.openwbem) \
		$(REGISTRATIONS.sniacimom)

# We must explicity add all the schema files to the distribution package
pkgdata_DATA=$(SCHEMAS) $(REGISTRATIONS)
pkgdata_SCRIPTS=provider-register.sh
EXTRA_DIST+=mof $(pkgdata_SCRIPTS)

# Register the provider(s) and class definition(s) to the current CIM server/CIMOM
postinstall:
	test x"$(SCHEMAS)" != x && \
		sh provider-register.sh -t @CIMSERVER@ -s $(SCHEMAS)
	test x"$(REGISTRATIONS.@CIMSERVER@)" != x && \
		sh provider-register.sh -t @CIMSERVER@ -r $(REGISTRATIONS.@CIMSERVER@)

dist-hook:
	test -d "$(distdir)" &&	rm -rf `find $(distdir) -type d -name CVS`
#
# Automake instructions for ./test subdir
#
EXTRA_DIST+=test README.TEST
if TESTSUITE
testsuitedir=@TESTSUITEDIR@
testsuitesystemdir=@TESTSUITEDIR@/system/linux
testsuitecimdir=@TESTSUITEDIR@/cim

testsuite_SCRIPTS=test/test-cmpi-fsvol.sh
testsuitesystem_DATA=test/system/linux/Linux_Ext2FileSystem.system \
	test/system/linux/Linux_Ext3FileSystem.system \
	test/system/linux/Linux_HostedFileSystem.system \
	test/system/linux/Linux_ReiserFileSystem.system
testsuitesystem_SCRIPTS=test/system/linux/Linux_Ext2FileSystem.pl \
	test/system/linux/Linux_Ext3FileSystem.pl \
	test/system/linux/Linux_ReiserFileSystem.pl \
	test/system/linux/countFileSystemEntries.pl
testsuitecim_DATA=test/cim/Linux_BootOSFromFS.cim \
	test/cim/Linux_Ext2FileSystem.cim \
	test/cim/Linux_Ext3FileSystem.cim \
	test/cim/Linux_HostedFileSystem.cim \
	test/cim/Linux_NFS.cim \
	test/cim/Linux_ReiserFileSystem.cim 

runtest: install
	cd $(DESTDIR)$(TESTSUITEDIR) &&	./test-cmpi-fsvol.sh

doc_DATA+=README.TEST
endif

--- NEW FILE: provider-register.sh ---
#!/bin/sh
# $Id: provider-register.sh,v 1.1 2005/04/15 14:28:15 mihajlov Exp $
# ==================================================================
# (C) Copyright IBM Corp. 2005
#
# THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
# ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
# CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
#
# You can obtain a current copy of the Common Public License from
# http://www.opensource.org/licenses/cpl1.0.php
#
# Author:       Viktor Mihajlovski <mih...@de...>
# Contributors:
# Description:  Script to install class definitions (MOFs) and registration data
#		for a variety of supported CIMOMs
# ==================================================================

function pegasus_install()
{
    if ps -C cimserver > /dev/null 2>&1 
    then
	CIMMOF=cimmof
	state=active
    else
	CIMMOF=cimmofl
	state=inactive
    fi
    
    if test $1 == mofs 
    then
	NAMESPACE=root/cimv2
	action="Installing Schemas"
    else if test $1 == regs
    then
	NAMESPACE=root/PG_Interop
	action="Registering Providers"
    else
	echo "Invalid install mode " $1
	return 1
    fi
    fi

    shift
    echo $action with $state cimserver
    $CIMMOF -n $NAMESPACE $*
}

function sfcb_install()
{
    if test $1 == mofs 
    then
	action="Staging Schemas"
	shift
	params="$*"
    else if test $1 == regs
    then
	action="Staging Provider Registration -- rebuild repository and restart sfcb!"
	shift
	params="-r $*"
    else
	echo "Invalid install mode " $1
	return 1
    fi
    fi
    
    echo $action
    sfcbstage $params
}

function usage() 
{
    echo "usage: $0 [-h] -t <cimserver> [ -s mof ... | -r  regfile ... ]"
}

args=`getopt ht:r:s: $*`

if [ $? != 0 ]
then
    usage $0
    exit 1
fi

set -- $args

while [ -n "$1" ]
do
  case $1 in
      -h) help=1; 
	  shift;
	  break;;
      -t) cimserver=$2;
	  shift 2;;
      -s) mofs=$2;
	  shift 2;;
      -r) regs=$2;
	  shift 2;;
      --) shift;
	  break;;
      **) break;;
  esac
done

if [ "$help" == "1" ]
then
    usage
    echo -e "\t-h display help message"
    echo -e "\t-t specify cimserver type (pegasus|sfcb|openwbem|sniacimom)"
    echo -e "\t-s specify schema mofs"
    echo -e "\t-r specify registration files"
    echo
    echo Use this command install schema mofs or register provider
    echo CIM Server Type is required, schema and registration files are
    echo mutually exclusive.
    exit 0
fi

if test x$cimserver == x
then
    usage $0
    exit 1
fi

if test x"$mofs" == x && test x"$regs" == x
then
    usage $0
    exit 1
fi

if test x"$mofs" != x && test x"$regs" != x
then
    usage $0
    exit 1
fi

if test x"$mofs" != x
then
    mode=mofs
    mofs="$mofs $*"
else if test x"$regs" != x
then
    mode=regs
    regs="$regs $*"
fi
fi

case $cimserver in
    pegasus) pegasus_install $mode $mofs $regs;;
    sfcb)    sfcb_install $mode $mofs $regs;;
    openwbem) echo openwbem not yet supported && exit 1 ;;
    sniacimom) echo sniacimom not yet supported && exit 1 ;;
    **)	echo "Invalid CIM Server Type " $cimserver && exit 1;;
esac

[Sblim-commit] cmpi-fsvol/test README,1.3,NONE makefile,1.5,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867/test

Removed Files:
	README makefile 
Log Message:
Bug 1179169: Autoconfiscation with dependency on cmpi-base and optional
testsuite support.


--- README DELETED ---

--- makefile DELETED ---

[Sblim-commit] cmpi-fsvol/mof Linux_Fsvol.sfcb.reg,NONE,1.1 makefile.pegasus,1.2,NONE makefile.standalone,1.2,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol/mof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867/mof

Added Files:
	Linux_Fsvol.sfcb.reg 
Removed Files:
	makefile.pegasus makefile.standalone 
Log Message:
Bug 1179169: Autoconfiscation with dependency on cmpi-base and optional
testsuite support.


--- NEW FILE: Linux_Fsvol.sfcb.reg ---
[Linux_Ext2FileSystem]
   provider: OSBase_LocalFileSystemProvider
   location: cmpiOSBase_LocalFileSystemProvider
   type: instance
   namespace: root/cimv2
#
[Linux_Ext3FileSystem]
   provider: OSBase_LocalFileSystemProvider
   location: cmpiOSBase_LocalFileSystemProvider
   type: instance
   namespace: root/cimv2
#
[Linux_ReiserFileSystem]
   provider: OSBase_LocalFileSystemProvider
   location: cmpiOSBase_LocalFileSystemProvider
   type: instance
   namespace: root/cimv2
#
[Linux_NFS]
   provider: OSBase_NFSProvider
   location: cmpiOSBase_NFSProvider
   type: instance
   namespace: root/cimv2
#
[Linux_HostedFileSystem]
   provider: OSBase_HostedFileSystemProvider
   location: cmpiOSBase_HostedFileSystemProvider
   type: instance association
   namespace: root/cimv2
#
[Linux_BootOSFromFS]
   provider: OSBase_BootOSFromFSProvider
   location: cmpiOSBase_BootOSFromFSProvider
   type: instance association
   namespace: root/cimv2
#
[Linux_CSProcessor]
   provider: OSBase_CSProcessorProvider
   location: cmpiOSBase_CSProcessorProvider
   type: instance association
   namespace: root/cimv2

--- makefile.standalone DELETED ---

--- makefile.pegasus DELETED ---

[Sblim-commit] cmpi-fsvol/contrib SuSEconfig.sblim-cmpi-fsvol,1.1,NONE sblim-cmpi-fsvol.spec,1.4,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-fsvol/contrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23867/contrib

Removed Files:
	SuSEconfig.sblim-cmpi-fsvol sblim-cmpi-fsvol.spec 
Log Message:
Bug 1179169: Autoconfiscation with dependency on cmpi-base and optional
testsuite support.


--- SuSEconfig.sblim-cmpi-fsvol DELETED ---

--- sblim-cmpi-fsvol.spec DELETED ---

[Sblim-commit] cmpi-base README,1.10,1.11

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24264

Modified Files:
	README 
Log Message:
README correction.


Index: README
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/README,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- README	7 Apr 2005 12:40:21 -0000	1.10
+++ README	15 Apr 2005 11:23:01 -0000	1.11
@@ -198,5 +198,5 @@
 of providers. 
 
 How to set up and drive the test is described in the 
-README file of the test sub directory.
+README.TEST file.
 

[Sblim-commit] cmpi-base Makefile.am,1.3,1.4

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14484

Modified Files:
	Makefile.am 
Log Message:
Bug 1179465: Fixed distribution list for test files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	13 Apr 2005 13:01:11 -0000	1.3
+++ Makefile.am	15 Apr 2005 09:00:52 -0000	1.4
@@ -174,7 +174,7 @@
 #
 # Automake instructions for ./test subdir
 #
-EXTRA_DIST+=test
+EXTRA_DIST+=test README.TEST
 if TESTSUITE
 testsuitedir=@TESTSUITEDIR@
 testsuitesystemdir=@TESTSUITEDIR@/system/linux
@@ -204,5 +204,4 @@
 	cd $(DESTDIR)$(TESTSUITEDIR) &&	./test-cmpi-base.sh
 
 doc_DATA+=README.TEST
-EXTRA_DIST+=README.TEST
 endif

[Sblim-commit] cmpi-samples/cmpi-fad acinclude.m4,1.3,1.4

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-samples/cmpi-fad
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13711

Modified Files:
	acinclude.m4 
Log Message:
Bug 1182583: set have_CMPI to no if no header files.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/cmpi-fad/acinclude.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- acinclude.m4	11 Apr 2005 15:49:02 -0000	1.3
+++ acinclude.m4	14 Apr 2005 15:28:23 -0000	1.4
@@ -80,6 +80,7 @@
 		dnl AC_MSG_RESULT(yes)
 	],
 	[
+		have_CMPI=no
 		dnl AC_MSG_RESULT(no)
 	])
 

[Sblim-commit] indication_helper acinclude.m4,1.1.1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/indication_helper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12556

Modified Files:
	acinclude.m4 
Log Message:
Bug 1182583: set have_CMPI to no if no headers found.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sblim/indication_helper/acinclude.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- acinclude.m4	2 Feb 2005 19:06:51 -0000	1.1.1.1
+++ acinclude.m4	14 Apr 2005 15:26:54 -0000	1.2
@@ -79,6 +79,7 @@
 		dnl AC_MSG_RESULT(yes)
 	],
 	[
+		have_CMPI=no
 		dnl AC_MSG_RESULT(no)
 	])
 

[Sblim-commit] cmpi-base acinclude.m4,1.5,1.6

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12136

Modified Files:
	acinclude.m4 
Log Message:
Bug 1182583: set have_CMPI to no if no headers found.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/acinclude.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- acinclude.m4	13 Apr 2005 13:01:11 -0000	1.5
+++ acinclude.m4	14 Apr 2005 15:25:58 -0000	1.6
@@ -80,6 +80,7 @@
 		dnl AC_MSG_RESULT(yes)
 	],
 	[
+		have_CMPI=no
 		dnl AC_MSG_RESULT(no)
 	])
 

[Sblim-commit] cmpi-base ChangeLog,1.3,1.4 cmpiOSBase_OperatingSystem.c,1.16,1.17 cmpiOSBase_OperatingSystemProvider.c,1.13,1.14

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20153

Modified Files:
	ChangeLog cmpiOSBase_OperatingSystem.c 
	cmpiOSBase_OperatingSystemProvider.c 
Log Message:
bug# 1183083: fixed the problem, that only the first indication of
the monitored OS OperationalStatus property was delivered


Index: cmpiOSBase_OperatingSystemProvider.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystemProvider.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cmpiOSBase_OperatingSystemProvider.c	7 Apr 2005 14:26:34 -0000	1.13
+++ cmpiOSBase_OperatingSystemProvider.c	14 Apr 2005 14:37:05 -0000	1.14
@@ -487,7 +487,7 @@
 
   v->state = CMPI_goodValue;
   v->type = CMPI_uint16;
-  v->value.uint16 = ind_new;
+  v->value.uint16 = ind_OperationalStatus;
 
   ind_new = 0;
   _OSBASE_TRACE(1,("--- %s check() exited",_ClassName));

Index: cmpiOSBase_OperatingSystem.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystem.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cmpiOSBase_OperatingSystem.c	13 Apr 2005 13:57:22 -0000	1.16
+++ cmpiOSBase_OperatingSystem.c	14 Apr 2005 14:37:05 -0000	1.17
@@ -335,7 +335,7 @@
 
   if(getcpu(&cs) == 0) {
     pctcpu = 100*cs.cpu/cs.total;
-    _OSBASE_TRACE(2,("--- _check_OperationalStatus(): TotalCPUTimePct %d, OperationalStatus %i",pctcpu,*OperationalStatus));
+    _OSBASE_TRACE(2,("--- _check_OperationalStatus(): TotalCPUTimePct %d",pctcpu));
     if(pctcpu>=90 && *OperationalStatus!=4) {
       *OperationalStatus = 4;
       return 1;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	12 Apr 2005 08:19:08 -0000	1.3
+++ ChangeLog	14 Apr 2005 14:37:04 -0000	1.4
@@ -74,5 +74,7 @@
 * bug# 1181317: fixed sample indication filter in test/indication
   directory. Filter was still for old Linux_OperatingSystemIndication
   class, but should be for CIM_InstModification
+* bug# 1183083: fixed the problem, that only the first indication of
+  the monitored OS OperationalStatus property was delivered
 
 // ===================================================================

[Sblim-commit] cmpi-network CHANGE.LOG,1.7,1.8

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21655

Modified Files:
	CHANGE.LOG 
Log Message:
fixed version number for last check in


Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/CHANGE.LOG,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CHANGE.LOG	13 Apr 2005 14:49:04 -0000	1.7
+++ CHANGE.LOG	14 Apr 2005 10:57:01 -0000	1.8
@@ -27,6 +27,10 @@
 
 * bug# 1158159: fixed parsing of /proc/net/dev for systems with high
   amount of network traffic
+
+// ===================================================================
+// new in version 1.3.2 :
+
 * feature request# 1182259: set MAC address to property
   PermanentAddress of Linux_EthernetPort
 

[Sblim-commit] testsuite AUTHORS,NONE,1.1 COPYING,NONE,1.1 ChangeLog,NONE,1.1 Makefile.am,NONE,1.1 NEWS,NONE,1.1 autoconfiscate.sh,NONE,1.1 configure.ac,NONE,1.1 sblim-testsuite.spec.in,NONE,1.1 license.html,1.1,NONE makefile,1.1.1.3,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/testsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11070

Added Files:
	AUTHORS COPYING ChangeLog Makefile.am NEWS autoconfiscate.sh 
	configure.ac sblim-testsuite.spec.in 
Removed Files:
	license.html makefile 
Log Message:
Bug 1179465: Simple autoconfiscation.
The test suite is installed to /usr/share/sblim-testsuite
and /var/lib/sblim-testsuite.



--- license.html DELETED ---

--- NEW FILE: Makefile.am ---
# $Id: Makefile.am,v 1.1 2005/04/14 10:38:49 mihajlov Exp $
# ==================================================================
# (C) Copyright IBM Corp. 2005
#
# THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON PUBLIC LICENSE
# ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
# CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
#
# You can obtain a current copy of the Common Public License from
# http://www-128.ibm.com/developerworks/library/os-cpl.html
#
# Author:       Viktor Mihajlovski <mih...@de...>
# Contributors: Dr. Gareth S. Bestor <bes...@us...>
# Description:  Automake input file for SBLIM testsuite
# ==================================================================

# Various directories

pkgstatedir=$(localstatedir)/lib/$(PACKAGE)
systemtestdir=$(pkgdatadir)/system/linux
consistencetestdir=$(pkgdatadir)/cim

#
# Automake instructions
#

# docdir defines where the documentation goes
docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)

#
# Automake instructions for documentation
#
doc_DATA=README AUTHORS COPYING 

# We must explicity add the RPM spec file to the distribution package
EXTRA_DIST=sblim-testsuite.spec

# We must explicity add all the testsuite files to the distribution package
consistencetest_DATA=cim/SampleClass.cim 
systemtest_DATA=system/linux/SampleClass.system \
	system/linux/createKeyFiles.sh.sample
pkgdata_SCRIPTS=associator.pm  cimom.pm  consistence.pm  instance.pm \
	consistence.pl interface.pl run.sh
EXTRA_DIST+=$(pkgdata_SCRIPTS) $(consistencetest_DATA) $(systemtest_DATA)

install-data-local:
	test -d $(DESTDIR)$(pkgstatedir)/stat || $(mkdir_p) $(DESTDIR)$(pkgstatedir)/stat
	$(LN_S) $(pkgstatedir)/stat $(DESTDIR)$(pkgdatadir)

--- NEW FILE: autoconfiscate.sh ---
#!/bin/sh
#
# Script to setup autoconf/automake build environment.
# Run this first to create the configure script
# NO CHANGES SHOULD BE NECESSARY TO THIS FILE
aclocal --force &&
automake --add-missing --force-missing &&
autoconf --force &&
echo "You may now run ./configure"

--- NEW FILE: COPYING ---

--- NEW FILE: sblim-testsuite.spec.in ---
#
# $Id: sblim-testsuite.spec.in,v 1.1 2005/04/14 10:38:49 mihajlov Exp $
#
# Package spec for @PACKAGE@
#

BuildRoot: /var/tmp/buildroot

Summary: SBLIM testsuite
Name: @PACKAGE_TARNAME@
Version: @PACKAGE_VERSION@
Release: 0
Group: Systems Management/Base
License: Common Public License 1.0

Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2

Requires: perl
Requires: sblim-wbemcli

%Description
SBLIM automated testsuite scripts

%prep

%setup -T -b 0 -n %{name}-%{version}

export PATCH_GET=0
#%patch0 -p1

%build

%configure
make

%install

if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi

make DESTDIR=$RPM_BUILD_ROOT install

%clean
if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi

%post

%postun

%files
%defattr(-,root,root)
/usr/share
/var/lib

--- NEW FILE: NEWS ---

--- NEW FILE: ChangeLog ---

--- makefile DELETED ---

--- NEW FILE: configure.ac ---
#                                               -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

# PUT YOUR PACKAGE INFO HERE. e.g.
#AC_INIT(<PACKAGE_NAME>, <PACKAGE_VERSION>, <PACKAGE_BUGREPORT>, <PACKAGE_TARBALL>)
AC_INIT(SBLIM Testsuite, 1.2.1, hei...@de..., sblim-testsuite)

# CHANGE THIS TO THE RELATIVE PATHNAME OF *ONE* OF THE SOURCE FILES
AC_CONFIG_SRCDIR([run.sh])

# CHANGE THIS TO THE NAME OF THE RPM SPEC FILE
AC_CONFIG_FILES([sblim-testsuite.spec])

# DECLARE ANY SPECIAL CUSTOM CONFIGURE COMMAND LINE OPTIONS HERE

# ADD CHECKS FOR ANY SPECIAL REQUIRED PROGRAMS HERE. e.g.
AC_CHECK_PROG(PERL,perl,perl,not found)
AC_CHECK_PROG(WBEMCLI,wbemcli,wbemcli,not found)

# ADD CHECKS FOR ANY SPECIAL REQUIRED HEADER FILES HERE

# ADD CHECKS FOR ANY SPECIAL REQUIRED TYPEDEFS, STRUCTURES AND COMPILER OPTIONS HERE

# ADD CHECKS FOR ANY SPECIAL REQUIRED LIBRARY FUNCTIONS HERE

### NO CHANGES SHOULD BE NECESSARY BELOW
AC_CONFIG_FILES([Makefile])
AM_INIT_AUTOMAKE

# Check for required programs.
AC_PROG_LN_S

# Check for required headers

# Check for required CMPI header files (defined in acinclude.m4)

# Check for required libraries (defined in acinclude.m4)

# Check for CIM Server (defined in acinclude.m4)

# Display configuration options
echo "-------------------------------------------------------"
echo "Configuration for $PACKAGE complete."
echo ""
echo "Perl program is" $PERL
echo "WBEMCLI program is" $WBEMCLI
echo "-------------------------------------------------------"

# Generate configure scripts for the Makefile
AC_OUTPUT

echo "You may now run make"


--- NEW FILE: AUTHORS ---

[Sblim-commit] testsuite/contrib sblim-testsuite.spec,1.1,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/testsuite/contrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11070/contrib

Removed Files:
	sblim-testsuite.spec 
Log Message:
Bug 1179465: Simple autoconfiscation.
The test suite is installed to /usr/share/sblim-testsuite
and /var/lib/sblim-testsuite.



--- sblim-testsuite.spec DELETED ---

[Sblim-commit] sfcb httpAdapter.c,1.4,1.5 msgqueue.c,1.2,1.3 msgqueue.h,1.1.1.1,1.2 providerDrv.c,1.5,1.6 providerMgr.c,1.4,1.5 providerRegister.h,1.2,1.3 sfcBroker.c,1.5,1.6

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28608

Modified Files:
	httpAdapter.c msgqueue.c msgqueue.h providerDrv.c 
	providerMgr.c providerRegister.h sfcBroker.c 
Log Message:
Implemented 1176879 - Need "safe" shutdown of sfcb

killall -15 -3 -2 -1 sfcbd will now cause orderly cleanup of providers


Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- httpAdapter.c	21 Mar 2005 14:22:38 -0000	1.4
+++ httpAdapter.c	13 Apr 2005 15:15:41 -0000	1.5
@@ -62,6 +62,8 @@
 static int hBase;
 static int hMax;
 static int httpProcId;
+static int stopAccepting=0;
+static int running=0;
 
 #if defined USE_SSL
 SSL_CTX *ctx;
@@ -189,6 +191,7 @@
          break;
       }
       else {
+         running--;
          // fprintf(stderr, "%s: SIGCHLD signal %d - %s(%d)\n", name, pid,
          //        __FILE__, __LINE__);
       }
@@ -196,6 +199,11 @@
    errno = oerrno;
 }
 
+static void handleSigUsr1(int sig)
+{
+   stopAccepting=1;
+}
+
 static void freeBuffer(Buffer * b)
 {
    if (b->data)
@@ -737,6 +745,7 @@
          }
       }
       else if (r>0) {
+         running++;
          _SFCB_EXIT();
       }
    }
@@ -889,6 +898,10 @@
 //   memInit();
     currentProc=getpid();
     setSignal(SIGCHLD, handleSigChld,0);
+    setSignal(SIGUSR1, handleSigUsr1,0);
+    setSignal(SIGINT, SIG_IGN,0);
+    setSignal(SIGTERM, SIG_IGN,0);
+    setSignal(SIGHUP, SIG_IGN,0);
 
     commInit();
 
@@ -909,8 +922,10 @@
       listen(listenFd, 1);
       sz = sizeof(sin);
       if ((connFd = accept(listenFd, (__SOCKADDR_ARG) & sin, &sz))<0) {
-         if (errno == EINTR || errno == EAGAIN)
+         if (errno == EINTR || errno == EAGAIN) {
+            if (stopAccepting) break;
             continue;
+         }   
          perror("accept error");
          _SFCB_ABORT();
       }
@@ -919,5 +934,14 @@
       handleHttpRequest(connFd);
       close(connFd);
    }
+   
+//   printf("--- %s draining %d\n",processName,running);
+   for (;;) {
+      if (running==0) {
+         printf("--- %s terminating %d\n",processName,getpid());
+         exit(0);
+      }   
+      sleep(1);
+   }   
 
 }

Index: msgqueue.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- msgqueue.h	9 Mar 2005 12:25:12 -0000	1.1.1.1
+++ msgqueue.h	13 Apr 2005 15:15:41 -0000	1.2
@@ -115,6 +115,9 @@
    int send;
 } ComSockets;
 
+typedef struct mqgStat {
+  char teintr,eintr,rdone;
+} MqgStat;
 
 extern MsgSegment setCharsMsgSegment(char *);
 
@@ -131,7 +134,7 @@
                            void *data);
 extern int spSendReq(int *to, int *from, void *data, unsigned long size);
 extern int spRecvResult(int *q, int *from, void **data, unsigned long *length);
-extern int spRecvReq(int *q, int *from, void **data, unsigned long *length);
+extern int spRecvReq(int *q, int *from, void **data, unsigned long *length, MqgStat *mqg);
 extern int spSendResult(int *to, int *from, void *data, unsigned long size);
 extern unsigned long getInode(int fd);
 

Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- providerDrv.c	11 Apr 2005 23:13:42 -0000	1.5
+++ providerDrv.c	13 Apr 2005 15:15:41 -0000	1.6
@@ -86,6 +86,7 @@
 
 unsigned long provSampleInterval=10;
 unsigned long provTimeoutInterval=25;
+static int stopping=0;
 
 void libraryName(const char *location, char *fullName)
 {
@@ -119,33 +120,86 @@
 #endif
 }
 
-static void handleSigChld(int sig)
+int testStartedProc(int pid, int *left) 
 {
-   const int oerrno = errno;
-   pid_t pid;
-   int status;
+   ProviderProcess *pp=provProc;
+   int i,stopped=0;
+   
+   *left=0;
+   for (i=0; i<provProcMax; i++) {
+      if ((pp+i)->pid==pid) {
+         stopped=1;
+         (pp+i)->pid=0;
+      }   
+      if ((pp+i)->pid!=0) (*left)++;
+   }
+   
+   if (pid==classProvInfoPtr->pid) {
+      stopped=1;
+      classProvInfoPtr->pid=0;
+   }
+   if (classProvInfoPtr->pid!=0) (*left)++;
+   
+   return stopped;
+}         
 
-   for (;;) {
-      pid = wait3(&status, WNOHANG, (struct rusage *) 0);
-      if ((int) pid == 0)
-         break;
-      if ((int) pid < 0) {
-         if (errno == EINTR || errno == EAGAIN) {
-            fprintf(stderr, "pid: %d continue \n", pid);
-            continue;
-         }
-         if (errno != ECHILD)
-            perror("child wait");
-         break;
+int stopNextProc()
+{
+   ProviderProcess *pp=provProc;
+   int i,done=0,t;
+   
+   for (i=provProcMax-1; i; i--) {
+      if ((pp+i)->pid) {
+//         printf("killing 1 %d\n",(pp+i)->pid);
+         kill((pp+i)->pid,SIGUSR1);
+         return (pp+i)->pid;
       }
-      else {
- //        fprintf(stderr,"--- Provider process terminated - %d \n",pid);
+   }
+   
+   if (done==0) {
+      if (classProvInfoPtr && classProvInfoPtr->pid) {
+         t=classProvInfoPtr->pid;
+  //       printf("killing 2 %d\n",t);
+         kill(classProvInfoPtr->pid,SIGUSR1);
+         done=1;
+         return t;
       }
+   }   
+   
+//   printf("done\n");
+   return 0;
+}
+
+static void stopProc(void *p)
+{
+   ProviderInfo *pInfo;
+   CMPIContext *ctx = NULL;
+   
+   ctx = native_new_CMPIContext(TOOL_MM_ADD,NULL);
+   for (pInfo=curProvProc->firstProv; pInfo; pInfo=pInfo->next) {
+      if (pInfo->classMI) pInfo->classMI->ft->cleanup(pInfo->classMI, ctx);
+      if (pInfo->instanceMI) pInfo->instanceMI->ft->cleanup(pInfo->instanceMI, ctx);
+      if (pInfo->associationMI) pInfo->associationMI->ft->cleanup(pInfo->associationMI, ctx);
+      if (pInfo->methodMI) pInfo->methodMI->ft->cleanup(pInfo->methodMI, ctx);
+      if (pInfo->indicationMI) pInfo->indicationMI->ft->cleanup(pInfo->indicationMI, ctx);
    }
-   errno = oerrno;
+   exit(0);
+} 
+  
+
+static void handleSigUsr1(int sig)
+{
+   pthread_t t;
+   pthread_attr_t tattr;
+ 
+   stopping=1;  
+   pthread_attr_init(&tattr);
+   pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);      
+   pthread_create(&t, &tattr, (void *(*)(void *))stopProc,NULL);
 }
 
 
+
 /* -------------
  * ---
  *      Provider Loading support
@@ -187,6 +241,7 @@
       _SFCB_TRACE(1, ("--- providerIdleThread cycle restarted %d",currentProc));
       pthread_mutex_lock(&idleMtx);
       rc=pthread_cond_timedwait(&idleCnd,&idleMtx,&idleTime);
+      if (stopping) return NULL;
       if (rc==ETIMEDOUT) {
          time_t now;
          time(&now);
@@ -310,6 +365,7 @@
 static int getProcess(ProviderInfo * info, ProviderProcess ** proc)
 {
    int i;
+   static int seq=0;
 
    _SFCB_ENTER(TRACE_PROVIDERDRV, "getProcess");
 
@@ -355,6 +411,9 @@
 
             currentProc=getpid();
             setSignal(SIGCHLD, SIG_DFL,0);
+            setSignal(SIGTERM, SIG_IGN,0);
+            setSignal(SIGHUP, SIG_IGN,0);
+            setSignal(SIGUSR1, handleSigUsr1,0);
             
             curProvProc=(*proc);
             resultSockets=sPairs[(*proc)->id+ptBase];
@@ -377,7 +436,7 @@
          }
 
          else {
-    //        closeSocket(&providerSockets,cRcv,"getProcess");         
+           info->startSeq=++seq;
          }
          _SFCB_TRACE(1,("--- Fork provider OK %s %d %d\n", info->providerName,
                       info->pid, i));
@@ -1847,6 +1906,7 @@
    int rc,debugMode=0,once=1;
    pthread_t t;
    pthread_attr_t tattr;
+   MqgStat mqg;
 
    _SFCB_ENTER(TRACE_PROVIDERDRV, "processProviderInvocationRequests");
 
@@ -1861,26 +1921,31 @@
       parms = (Parms *) malloc(sizeof(*parms));
       
       rc = spRecvReq(&providerSockets.receive, &parms->requestor,
-                     (void **) &parms->req, &rl);
-      if (rc!=0) fprintf(stderr,"oops\n");               
+                     (void **) &parms->req, &rl, &mqg);
+      if (mqg.rdone) {               
+         if (rc!=0) fprintf(stderr,"oops\n");               
 
-      _SFCB_TRACE(1, ("--- Got something %d-%p on %d-%lu", 
-         parms->req->operation,parms->req->provId,
-         providerSockets.receive,getInode(providerSockets.receive)));
+         _SFCB_TRACE(1, ("--- Got something %d-%p on %d-%lu", 
+            parms->req->operation,parms->req->provId,
+            providerSockets.receive,getInode(providerSockets.receive)));
 
-      if (once && debugMode && parms->req->operation != OPS_LoadProvider) for (;;) {
-         fprintf(stdout,"-#- Pausing for provider: %s -pid: %d\n",name,currentProc);
-         once=0;      
-         sleep(5);
-      }
+         if (once && debugMode && parms->req->operation != OPS_LoadProvider) for (;;) {
+            fprintf(stdout,"-#- Pausing for provider: %s -pid: %d\n",name,currentProc);
+            once=0;      
+            sleep(5);
+         }
 
-      if (parms->req->operation == OPS_LoadProvider || debugMode) {
-         processProviderInvocationRequestsThread(parms);
+         if (parms->req->operation == OPS_LoadProvider || debugMode) {
+            processProviderInvocationRequestsThread(parms);
+         }
+         else {
+            pthread_create(&t, &tattr, (void *(*)(void *))
+                processProviderInvocationRequestsThread, (void *) parms);
+         }
       }
       else {
-         pthread_create(&t, &tattr, (void *(*)(void *))
-             processProviderInvocationRequestsThread, (void *) parms);
-      }
+//            printf("-------- eintr ?\n");
+      }   
    }
    _SFCB_EXIT();
 }

Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- providerMgr.c	11 Apr 2005 23:13:42 -0000	1.4
+++ providerMgr.c	13 Apr 2005 15:15:42 -0000	1.5
@@ -22,7 +22,7 @@
 
 
 #define SFCB_INCL_INDICATION_SUPPORT 1
-
+  
 #include <signal.h>
 #include <time.h>
 
@@ -712,6 +712,7 @@
    unsigned long rl;
    int rc;
    char *cn, *ns;
+   MqgStat mqg;
  
    _SFCB_ENTER(TRACE_PROVIDERMGR, "processProviderMgrRequests");
 
@@ -723,26 +724,31 @@
    }   
       
    for (;;) {
-      MgrHandler hdlr;
+      MgrHandler hdlr; 
 
       _SFCB_TRACE(1,("--- Waiting for mgr request to %d ", sfcbSockets.receive));
 
-      if ((rc = spRecvReq(&sfcbSockets.receive, &requestor, (void **) &req, &rl)) == 0) {
-         req->nameSpace.data=(void*)((int)req->nameSpace.data+(char*)req);
-         if (req->className.length)
-            req->className.data=(void*)((int)req->className.data+(char*)req);
-         else req->className.data=NULL;
-         cn = (char *) req->className.data;
-         ns = (char *) req->nameSpace.data;
+      if ((rc = spRecvReq(&sfcbSockets.receive, &requestor, (void **) &req, &rl, &mqg)) == 0) {
+         if (mqg.rdone) {
+            req->nameSpace.data=(void*)((int)req->nameSpace.data+(char*)req);
+            if (req->className.length)
+               req->className.data=(void*)((int)req->className.data+(char*)req);
+            else req->className.data=NULL;
+            cn = (char *) req->className.data;
+            ns = (char *) req->nameSpace.data;
 
-        _SFCB_TRACE(1,("--- Mgr request for %s-%s (%d) from %d", req->nameSpace.data,
+           _SFCB_TRACE(1,("--- Mgr request for %s-%s (%d) from %d", req->nameSpace.data,
                 req->className.data,req->type,requestor));
                 
-        hdlr = mHandlers[req->type];
-        hdlr.handler(&requestor, req);
-        _SFCB_TRACE(1,("--- Mgr request for %s-%s DONE", req->nameSpace.data,
+           hdlr = mHandlers[req->type];
+           hdlr.handler(&requestor, req);
+           _SFCB_TRACE(1,("--- Mgr request for %s-%s DONE", req->nameSpace.data,
               req->className.data));
-         free(req);
+            free(req);
+         }
+         else {
+//            printf("-------- eintr ?\n");
+         }
       }
       else {
          _SFCB_ABORT();

Index: providerRegister.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerRegister.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- providerRegister.h	30 Mar 2005 12:30:51 -0000	1.2
+++ providerRegister.h	13 Apr 2005 15:15:42 -0000	1.3
@@ -60,6 +60,7 @@
    pthread_t idleThread;
    pthread_mutex_t initMtx;
    time_t lastActivity;
+   int startSeq;
    struct _ProviderInfo *next;
    struct providerProcess *proc;
    CMPIInstanceMI *instanceMI;

Index: sfcBroker.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sfcBroker.c	1 Apr 2005 15:19:29 -0000	1.5
+++ sfcBroker.c	13 Apr 2005 15:15:42 -0000	1.6
@@ -49,6 +49,9 @@
 extern void initProvProcCtl(int);
 extern void processTerminated(int pid);
 
+extern int stopNextProc();
+extern int testStartedProc(int pid, int *left);
+
 extern TraceId traceIds[];
 extern int sfcBrokerPid;
 
@@ -64,6 +67,7 @@
 
 static char **restartArgv;
 static int restartArgc;
+static int adaptersStopped=0,providersStopped=0,restartBroker=0;
 
 extern char * configfile;
 
@@ -75,11 +79,143 @@
    unlink(the_file);
 }
 
+typedef struct startedAdapter {
+   struct startedAdapter *next;
+   int stopped;
+   int pid;
+} StartedAdapter;
+
+StartedAdapter *lastStartedAdapter=NULL;
+
+void addStartedAdapter(int pid)
+{
+   StartedAdapter *sa=(StartedAdapter*)malloc(sizeof(StartedAdapter));
+
+   sa->stopped=0;
+   sa->pid=pid;
+   sa->next=lastStartedAdapter;
+   lastStartedAdapter=sa;
+}
+
+int testStartedAdapter(int pid, int *left) 
+{
+   StartedAdapter *sa=lastStartedAdapter;
+   int stopped=0;
+   
+   *left=0;
+   while (sa) {
+      if (sa->pid==pid) stopped=sa->stopped=1;
+      if (sa->stopped==0) (*left)++;
+      sa=sa->next;
+   }
+   return stopped;
+}         
+
+int stopNextAdapter()
+{
+   StartedAdapter *sa=lastStartedAdapter;
+   
+   while (sa) {
+      if (sa->stopped==0) {
+         sa->stopped=1;
+         kill(sa->pid,SIGUSR1);
+         return sa->pid;
+      }   
+      sa=sa->next;
+   }
+   return 0;
+}
+
+static pthread_mutex_t sdMtx=PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t  sdCnd=PTHREAD_COND_INITIALIZER;
+static int stopping=0;
+   
+static void stopBroker(void *p)
+{
+   struct timespec waitTime;
+   int rc,sa=0,sp=0;
+   
+   stopping=1;
+   
+   for(;;) {
+      waitTime.tv_sec=time(NULL)+5;
+      waitTime.tv_nsec=0;
+
+      if (adaptersStopped==0) {
+         pthread_mutex_lock(&sdMtx);
+         if (sa==0) printf("--- Stopping adapters\n");
+         sa++;
+         if (stopNextAdapter()) {
+            rc=pthread_cond_timedwait(&sdCnd,&sdMtx,&waitTime);
+         }
+//         else adaptersStopped=1;
+         pthread_mutex_unlock(&sdMtx);
+      }
+      
+      if (adaptersStopped) {
+         pthread_mutex_lock(&sdMtx);
+         if (sp==0) printf("--- Stopping providers\n");
+         sp++;
+         if (stopNextProc()) {
+            rc=pthread_cond_timedwait(&sdCnd,&sdMtx,&waitTime);
+         }   
+         //else providersStopped=1;
+         pthread_mutex_unlock(&sdMtx);
+      }
+      if (providersStopped) break;
+   }
+   
+   if (restartBroker) {
+      printf("---\n");   
+      execvp("sfcbd",restartArgv);
+      perror("--- execv for restart problem:");
+      abort();
+   }
+
+   else exit(0);
+}   
+
+static void signalBroker(void *p)
+{
+     pthread_mutex_lock(&sdMtx);
+     pthread_cond_signal(&sdCnd);
+     pthread_mutex_unlock(&sdMtx);
+} 
+  
+static void handleSigquit(int sig)
+{
+   pthread_t t;
+   pthread_attr_t tattr;
+   
+   if (sfcBrokerPid==currentProc) {    
+      fprintf(stderr, "--- Winding down %s\n", processName);
+      pthread_attr_init(&tattr);
+      pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);      
+      pthread_create(&t, &tattr, (void *(*)(void *))stopBroker,NULL);
+   } 
+}
+
+static void handleSigHup(int sig)
+{
+  pthread_t t;
+  pthread_attr_t tattr;
+  
+   if (sfcBrokerPid==currentProc) {    
+      restartBroker=1;
+      fprintf(stderr, "--- Restarting %s\n", processName);
+      pthread_attr_init(&tattr);
+      pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);      
+      pthread_create(&t, &tattr, (void *(*)(void *))stopBroker,NULL);
+   } 
+}
+
 static void handleSigChld(int sig)
 {
    const int oerrno = errno;
    pid_t pid;
-   int status;
+   int status,left;
+   pthread_t t;
+   pthread_attr_t tattr;
 
    for (;;) {
       pid = wait3(&status, WNOHANG, (struct rusage *) 0);
@@ -95,7 +231,25 @@
          break;
       }
       else {
- //        fprintf(stderr,"--- Provider process terminated - %d \n",pid);
+//         printf("sigchild %d\n",pid);
+         if (testStartedAdapter(pid,&left)) { 
+            if (left==0) {
+               fprintf(stderr,"--- Adapters stopped\n");
+               adaptersStopped=1;
+            }   
+            pthread_attr_init(&tattr);
+            pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);      
+            pthread_create(&t, &tattr, (void *(*)(void *))signalBroker,NULL);   
+         }
+         else if (testStartedProc(pid,&left)) {
+            if (left==0) {
+               fprintf(stderr,"--- Providers stopped\n");
+               providersStopped=1;
+            }   
+            pthread_attr_init(&tattr);
+            pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);      
+            pthread_create(&t, &tattr, (void *(*)(void *))signalBroker,NULL);
+         }
       }
    }
    errno = oerrno;
@@ -113,38 +267,6 @@
    exit(1);
 }
 
-static void restartSfcBroker(void *p)
-{
-   sleep(1);
-   printf("\n--- \n--- Restarting sfcbd\n---\n");
-   
-   execvp("sfcbd",restartArgv);
-   perror("--- execv for restart problem:");
-   abort();
-}
-
-//SIGHUP
-//static void handleSigUser(int sig)
-static void handleSigHup(int sig)
-{
-  pthread_t t;
-  pthread_attr_t tattr;
-  
-  if (sfcBrokerPid==currentProc) {    
- //     setSignal(SIGHUP,SIG_DFL,0);
-      pthread_attr_init(&tattr);
-      pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
-      
-      pthread_create(&t, &tattr, (void *(*)(void *))
-         restartSfcBroker,NULL);
-
-   } 
-   else {
-      fprintf(stderr, "--- %s - %d exiting due to signal %d\n", processName, currentProc, sig);
-      kill(currentProc,SIGKILL);
-   }   
-}
-
 static void handleSigSegv(int sig)
 {
    fprintf(stderr, "-#- %s - %d exiting due to a SIGSEGV signal\n",
@@ -176,6 +298,7 @@
       closeSocket(&resultSockets,cAll,"startHttpd");
    }
    else {
+      addStartedAdapter(pid);
       return 0;
    }
    return 0;
@@ -294,10 +417,12 @@
    init_sfcBroker(NULL);
    initSocketPairs(pSockets,dSockets,0);
 
-   setSignal(SIGTERM, handleSigterm,SA_ONESHOT);
-   setSignal(SIGINT,  handleSigterm,0);
+   setSignal(SIGQUIT, handleSigquit,0);
+   setSignal(SIGTERM, handleSigquit,0);
+   setSignal(SIGINT,  handleSigquit,0);
+   
    setSignal(SIGKILL, handleSigterm,0);
-   setSignal(SIGHUP, handleSigHup,SA_NOMASK);
+   setSignal(SIGHUP,  handleSigHup,0);
    
    if (startHttp) {
       if (sslMode)

Index: msgqueue.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- msgqueue.c	17 Mar 2005 21:14:36 -0000	1.2
+++ msgqueue.c	13 Apr 2005 15:15:41 -0000	1.3
@@ -173,7 +173,7 @@
  *              spGetMsg
  */
 
-static int spGetMsg(int *s, void *data, unsigned length)
+static int spGetMsg(int *s, void *data, unsigned length, MqgStat* mqg)
 {
    static char *em = "spGetMsg receiving from";
    ssize_t n,ol,r=0;
@@ -183,9 +183,14 @@
 
    ol = length;
    for (;;) {
+      if (mqg) mqg->teintr=0;
       if ((n = recv(*s, data+r, length-r, 0)) < 0) {
          if (errno == EINTR) {
             _SFCB_TRACE(1, (" Receive interrupted %d",currentProc));
+            if (mqg) {
+               mqg->teintr=1;
+               return 0;
+            }
             continue;
          }
          return spHandleError(s, em);
@@ -208,26 +213,40 @@
  *              spRcvMsg
  */
 
-static int spRcvMsg(int *s, int *from, void **data, unsigned long *length)
+static int spRcvMsg(int *s, int *from, void **data, unsigned long *length, MqgStat* mqg)
 {
    SpMessageHdr spMsg;
    static char *em = "rcvMsg receiving from";
+   MqgStat imqg;
 
    _SFCB_ENTER(TRACE_MSGQUEUE, "spRcvMsg");
    _SFCB_TRACE(1, ("--- Receiving from %d", *s));
 
-   if ((spGetMsg(s, &spMsg, sizeof(spMsg))) == -1)
+   if ((spGetMsg(s, &spMsg, sizeof(spMsg), mqg)) == -1)
       return spHandleError(s, em);
+      
+   if (mqg && mqg->teintr) {
+      mqg->eintr=1;    
+      mqg->rdone=0;
+      return 0;  
+   }   
    *from=spMsg.returnS;   
 
    _SFCB_TRACE(1, ("--- Received info segment %d bytes", sizeof(spMsg)));
 
    *length = spMsg.totalSize;
 
+   if (mqg==NULL) mqg=&imqg;
+   mqg->rdone=1;
+   mqg->eintr=0;
+   
    if (*length) {
       *data = malloc(spMsg.totalSize + 8);
-      if ((spGetMsg(s, *data, *length)) == -1)
-         return spHandleError(s, em);
+      do {
+         if ((spGetMsg(s, *data, *length, mqg)) == -1)
+            return spHandleError(s, em);
+         if (mqg->teintr) mqg->eintr=1;    
+      } while (mqg->teintr) ;       
       _SFCB_TRACE(1, ("--- Received data segment %d bytes", *length));
    }
 
@@ -239,8 +258,11 @@
    if (spMsg.type.ctl.xtra == MSG_X_EXTENDED_CTL_MSG) {
       *data = malloc(256);
       *length = 256;
-      if ((spGetMsg(s, *data, *length)) == -1)
-         return spHandleError(s, em);
+      do {
+         if ((spGetMsg(s, *data, *length, mqg)) == -1)
+            return spHandleError(s, em);
+         if (mqg->teintr) mqg->eintr=1;    
+      } while (mqg->teintr) ;       
    }
 
    switch (spMsg.type.ctl.xtra) {
@@ -257,14 +279,15 @@
              spMsg.type.ctl.xtra);
       abort();
    }
+   
    _SFCB_RETURN(spMsg.type.ctl.xtra);
 }
 
-int spRecvReq(int *s, int *from, void **data, unsigned long *length)
+int spRecvReq(int *s, int *from, void **data, unsigned long *length, MqgStat *mqg)
 {
    int rc;
    _SFCB_ENTER(TRACE_MSGQUEUE, "spRecvReq");
-   rc = spRcvMsg(s, from, data, length);
+   rc = spRcvMsg(s, from, data, length, mqg);
    _SFCB_RETURN(rc);
 }
 
@@ -272,7 +295,7 @@
 {
    int rc;
    _SFCB_ENTER(TRACE_MSGQUEUE, "spRecvResult");
-   rc = spRcvMsg(s, from, data, length);
+   rc = spRcvMsg(s, from, data, length, NULL);
    _SFCB_RETURN(rc);
 }
 
@@ -280,7 +303,7 @@
 {
    int rc;
    _SFCB_ENTER(TRACE_MSGQUEUE, "spRecvCtlResult");
-   rc = spRcvMsg(s, from, data, length);
+   rc = spRcvMsg(s, from, data, length, NULL);
    _SFCB_RETURN(rc);
 }
 

[Sblim-commit] sfcb cimXmlGen.c,1.3,1.4

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23726

Modified Files:
	cimXmlGen.c 
Log Message:
fixing numeric parsing for CMPIObjectPathes - could be related to 1181968


Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cimXmlGen.c	21 Mar 2005 14:22:38 -0000	1.3
+++ cimXmlGen.c	13 Apr 2005 15:06:52 -0000	1.4
@@ -118,10 +118,10 @@
       else if (strcasecmp(type, "numeric") == 0) {
          if (value[0] == '+' || value[0] == '-') {
             *typ = CMPI_sint64;
-            sscanf(value, "%llu", &val->uint64);
+            sscanf(value, "%lld", &val->uint64);
          }
          else {
-            sscanf(value, "%lld", &val->sint64);
+            sscanf(value, "%llu", &val->sint64);
             *typ = CMPI_uint64;
          }
          return val;

[Sblim-commit] cmpi-network CHANGE.LOG,1.6,1.7

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14960

Modified Files:
	CHANGE.LOG 
Log Message:
feature request# 1182259: MAC address is set as value for property 
PermanentAddress of class Linux_EthernetPort


Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/CHANGE.LOG,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CHANGE.LOG	7 Mar 2005 09:45:59 -0000	1.6
+++ CHANGE.LOG	13 Apr 2005 14:49:04 -0000	1.7
@@ -27,5 +27,7 @@
 
 * bug# 1158159: fixed parsing of /proc/net/dev for systems with high
   amount of network traffic
+* feature request# 1182259: set MAC address to property
+  PermanentAddress of Linux_EthernetPort
 
 // ===================================================================

[Sblim-commit] cmpi-network cmpiOSBase_EthernetPort.c,1.8,1.9 OSBase_CommonNetwork.c,1.7,1.8 OSBase_CommonNetwork.h,1.5,1.6

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9049

Modified Files:
	cmpiOSBase_EthernetPort.c OSBase_CommonNetwork.c 
	OSBase_CommonNetwork.h 
Log Message:
feature request# 1182259: MAC address is set as value for property 
PermanentAddress of class Linux_EthernetPort


Index: OSBase_CommonNetwork.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/OSBase_CommonNetwork.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- OSBase_CommonNetwork.c	7 Mar 2005 09:46:00 -0000	1.7
+++ OSBase_CommonNetwork.c	13 Apr 2005 14:41:08 -0000	1.8
@@ -156,6 +156,7 @@
       rc = 0;
     }
   }
+  else { freeresultbuf(hderr); }
 
   freeresultbuf(hdout);
   _OSBASE_TRACE(3,("--- enum_all_netPorts() exited"));
@@ -214,6 +215,8 @@
   char ** hdout = NULL;
   char ** hderr = NULL;
   char *  cmd   = NULL;
+  char *  ptr   = NULL;
+  char *  end   = NULL;
   int     rc    = 0;
 
   _OSBASE_TRACE(4,("--- _netPort_data() called"));
@@ -230,14 +233,32 @@
   /* EnabledStatus : Unknown = 0 ; Enabled = 2 ; Disabled = 3 */
   (*sptr)->enabled =  _get_port_status(id);
 
+  /* PermanentAddress */
+  cmd = calloc(1,100);
+  strcpy(cmd, "/sbin/ifconfig ");
+  strcat(cmd, id);      
+  rc = runcommand(cmd, NULL , &hdout , &hderr);
+  memset(cmd,0,100);
+  rc=0;
+  if(rc==0) {
+    if( (ptr=strstr(hdout[0],"HWaddr")) != NULL) {
+      ptr=strchr(ptr,' ');
+      end=strchr(ptr+1,' ');
+      (*sptr)->mac_addr = calloc(1,strlen(ptr)-strlen(end));
+      strncpy((*sptr)->mac_addr,ptr+1,strlen(ptr)-strlen(end)-1);
+    }
+  }
+  freeresultbuf(hdout);
+  freeresultbuf(hderr);
+
   /* Speed and MaxSpeed ... depends on used Link Technology */
 
   /* Ethernet  */
   if( (*sptr)->linkTec == 2 ) {
-    cmd = calloc(1,(strlen(id)+19));
     strcpy(cmd, "/sbin/mii-tool -v ");
     strcat(cmd, id);
     rc = runcommand(cmd, NULL, &hdout, &hderr);
+    memset(cmd,0,100);
     if( (rc == 0) && (hdout != NULL) ) {
       if( strstr(hdout[0], "100base") != NULL ) {
 	(*sptr)->speed = 100*1024*1024; /* Bits per second */
@@ -254,7 +275,6 @@
 	}
       }
     }
-    if(cmd) free(cmd);
     freeresultbuf(hdout);
     freeresultbuf(hderr);
     rc=0;
@@ -266,6 +286,7 @@
   /* Other : Local Loopback  */ 
   /* else if( (*sptr)->linkTec == 1 ) { } */
 
+  if(cmd) free(cmd);
   _OSBASE_TRACE(4,("--- _netPort_data() exited"));
   return rc;
 }
@@ -287,6 +308,7 @@
 void free_netPort( struct cim_netPort * sptr ) {  
   if(sptr == NULL) return;
   if(sptr->name) free(sptr->name);
+  if(sptr->mac_addr) free(sptr->mac_addr);
   free(sptr);
 }
 

Index: cmpiOSBase_EthernetPort.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/cmpiOSBase_EthernetPort.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cmpiOSBase_EthernetPort.c	20 Sep 2004 12:16:06 -0000	1.8
+++ cmpiOSBase_EthernetPort.c	13 Apr 2005 14:41:08 -0000	1.9
@@ -159,6 +159,8 @@
   CMSetProperty( ci, "Speed", (CMPIValue*)&(sptr->speed), CMPI_uint64);
   CMSetProperty( ci, "MaxSpeed", (CMPIValue*)&(sptr->maxSpeed), CMPI_uint64);
 
+  CMSetProperty( ci, "PermanentAddress", sptr->mac_addr, CMPI_chars);  
+
   /* 2.7 */
 #ifndef CIM26COMPAT
   CMSetProperty( ci, "ElementName", sptr->name, CMPI_chars);  

Index: OSBase_CommonNetwork.h
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/OSBase_CommonNetwork.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- OSBase_CommonNetwork.h	15 Oct 2003 12:24:15 -0000	1.5
+++ OSBase_CommonNetwork.h	13 Apr 2005 14:41:08 -0000	1.6
@@ -38,6 +38,7 @@
 
 struct cim_netPort {
   char             * name;
+  char             * mac_addr;
   unsigned short     linkTec;
   unsigned short     type;
   unsigned short     enabled;

[Sblim-commit] cmpi-base cmpiOSBase_OperatingSystem.c,1.15,1.16

[Heidi E. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16000

Modified Files:
	cmpiOSBase_OperatingSystem.c 
Log Message:
minor updates to retrieve the value of OperationalStatus


Index: cmpiOSBase_OperatingSystem.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/cmpiOSBase_OperatingSystem.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cmpiOSBase_OperatingSystem.c	6 Apr 2005 15:43:16 -0000	1.15
+++ cmpiOSBase_OperatingSystem.c	13 Apr 2005 13:57:22 -0000	1.16
@@ -139,7 +139,6 @@
   return ci;
 }
 
-
 static int getcpu(CpuSample * cps)
 {
   unsigned long user, system, nice, idle;
@@ -172,9 +171,6 @@
   CMPIArray      *   opstat    = NULL;
   unsigned short     status    = 2; /* Enabled */
   unsigned short     opstatval = 2; /* 2 ... OK ; 4 ... Stressed */
-#ifndef NOEVENTS
-  int                opval     = 2;
-#endif
 #endif
 
   _OSBASE_TRACE(2,("--- _makeOS() called"));
@@ -309,12 +305,7 @@
     goto exit;
   }
   else {
-#ifndef NOEVENTS
-    check_OperationalStatus(&opval);
-    opstatval = opval;
-#else
-    if( pctcpu > 90 ) { opstatval = 4; }
-#endif
+    if( pctcpu >= 90 ) { opstatval = 4; }
     CMSetArrayElementAt(opstat,0,(CMPIValue*)&(opstatval),CMPI_uint16);
     CMSetProperty( ci, "OperationalStatus", (CMPIValue*)&(opstat), CMPI_uint16A);
   }
@@ -342,11 +333,10 @@
   CpuSample      cs;
   unsigned short pctcpu = 0;
 
-  if(getcpu(&cs) == 0) { 
+  if(getcpu(&cs) == 0) {
     pctcpu = 100*cs.cpu/cs.total;
-    _OSBASE_TRACE(2,("--- _check_OperationalStatus value : %d",pctcpu));
+    _OSBASE_TRACE(2,("--- _check_OperationalStatus(): TotalCPUTimePct %d, OperationalStatus %i",pctcpu,*OperationalStatus));
     if(pctcpu>=90 && *OperationalStatus!=4) {
-    //    if(pctcpu>=10 && *OperationalStatus!=4) {
       *OperationalStatus = 4;
       return 1;
     }

[Sblim-commit] cmpi-base/test README,1.3,NONE makefile,1.9,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12796/test

Removed Files:
	README makefile 
Log Message:
Bug 1179465: Added testsuite support to the automake build.
This included additional check macros in acinclude.m4 (phew).
Further the RPM specs had to be adapted.


--- README DELETED ---

--- makefile DELETED ---

[Sblim-commit] cmpi-base README.TEST,NONE,1.1 Makefile.am,1.2,1.3 acinclude.m4,1.4,1.5 configure.ac,1.3,1.4 sblim-cmpi-base.spec.in,1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12796

Modified Files:
	Makefile.am acinclude.m4 configure.ac sblim-cmpi-base.spec.in 
Added Files:
	README.TEST 
Log Message:
Bug 1179465: Added testsuite support to the automake build.
This included additional check macros in acinclude.m4 (phew).
Further the RPM specs had to be adapted.


Index: sblim-cmpi-base.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/sblim-cmpi-base.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sblim-cmpi-base.spec.in	6 Apr 2005 16:29:47 -0000	1.1
+++ sblim-cmpi-base.spec.in	13 Apr 2005 13:01:11 -0000	1.2
@@ -29,6 +29,15 @@
 %Description devel
 SBLIM Base Provider Development Package
 
+%Package test
+Summary: SBLIM Base Instrumentation Testcase Files
+Group: Systems Management/Base
+Requires: %{name} = %{version}
+Requires: sblim-wbemcli
+
+%Description test
+SBLIM Base Provider Testcase Files for the SBLIM Testsuite
+
 %prep
 
 %setup -n %{name}-%{version}
@@ -39,7 +48,7 @@
 
 %build
 
-%configure
+%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite
 make
 
 %clean
@@ -102,4 +111,9 @@
 %defattr(-,root,root)
 %{_includedir}
 
+%files test
+
+%defattr(-,root,root)
+%{_datadir}/sblim-testsuite
+
 

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/acinclude.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- acinclude.m4	11 Apr 2005 15:45:29 -0000	1.4
+++ acinclude.m4	13 Apr 2005 13:01:11 -0000	1.5
@@ -204,10 +204,19 @@
 	[
 	AC_MSG_CHECKING(for CMPI provider directory)
 	_DIRS="$libdir/cmpi"
+	save_exec_prefix=${exec_prefix}
+	save_prefix=${prefix}
+	if test xNONE == x${prefix}; then
+		prefix=/usr/local
+	fi
+	if test xNONE == x${exec_prefix}; then
+		exec_prefix=$prefix
+	fi
 	for _dir in $_DIRS
 	do
+		_xdir=`eval echo $_dir`
 		AC_MSG_CHECKING( $_dir )
-		if test -d $_dir ; then
+		if test -d $_xdir ; then
 		  dnl Found it
 		  AC_MSG_RESULT(yes)
 		  if test x"$PROVIDERDIR" == x ; then
@@ -220,6 +229,8 @@
 		PROVIDERDIR="$libdir"/cmpi
 		AC_MSG_RESULT(implied: $PROVIDERDIR)
 	fi
+	exec_prefix=$save_exec_prefix
+	prefix=$save_prefix
 	]
 )
 
@@ -256,3 +267,43 @@
 	]
 )
 
+dnl
+dnl The check for the SBLIM test suite
+dnl Sets the TESTSUITEDIR variable and the TESTSUITE conditional
+dnl
+
+AC_DEFUN([CHECK_TESTSUITE],
+	[
+	AC_MSG_CHECKING(for SBLIM testsuite)
+	_DIRS="$datadir/sblim-testsuite"
+	save_exec_prefix=${exec_prefix}
+	save_prefix=${prefix}
+	if test xNONE == x${prefix}; then
+		prefix=/usr/local
+	fi
+	if test xNONE == x${exec_prefix}; then
+		exec_prefix=$prefix
+	fi
+	for _name in $_DIRS
+	do
+	 	AC_MSG_CHECKING( $_name )
+		_xname=`eval echo $_name`
+		if test -x $_xname/run.sh ; then
+		  dnl Found it
+		  AC_MSG_RESULT(yes)
+		  if test x"$TESTSUITEDIR" == x; then
+		  	TESTSUITEDIR=$_name
+		  fi
+		  AC_SUBST(TESTSUITEDIR)
+		  break;
+		fi
+        done
+	if test x"$TESTSUITEDIR" == x ; then
+		AC_MSG_RESULT(no)
+	fi
+	AM_CONDITIONAL(TESTSUITE,[test x"$TESTSUITEDIR" != x])
+	exec_prefix=$save_exec_prefix
+	prefix=$save_prefix
+	]
+)
+

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	8 Apr 2005 11:48:47 -0000	1.3
+++ configure.ac	13 Apr 2005 13:01:11 -0000	1.4
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.4.3, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.4.3t, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
@@ -10,7 +10,7 @@
 AC_CANONICAL_HOST
 case $host_cpu in
      i*86) HW=INTEL;; 
-     s390) HW=S390;; 
+     s390*) HW=S390;; 
      ppc*) HW=PPC;; 
      x86_64) HW=X86_64;; 
      ia64) HW=IA64;; 
@@ -18,6 +18,7 @@
 esac
 
 # Configuration Arguments
+AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite resides.])
 AC_ARG_VAR([PROVIDERDIR],[the directory where the CMPI providers will be installed.])
 AC_ARG_VAR([CIMSERVER],[the target CIM server (pegasus|sfcb|openwbem|sniacimom).])
 
@@ -38,6 +39,9 @@
 # Check for CIM Server (defined in acinclude.m4)
 CHECK_CIMSERVER
 
+# Check for the Testsuite (defined in acinclude.m4)
+CHECK_TESTSUITE
+
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -88,6 +92,11 @@
 else	
    INDICATION_SUPPORT=Disabled
 fi
+if test x"$TESTSUITEDIR" == x; then
+   TESTSUITE_SUPPORT=Disabled
+else	
+   TESTSUITE_SUPPORT=Enabled
+fi
 # Display configuration options
 echo "-------------------------------------------------------"
 echo "Configuration for $PACKAGE complete."
@@ -97,6 +106,10 @@
 echo "PROVIDERDIR: " $PROVIDERDIR
 echo "CPPFLAGS:" $CPPFLAGS
 echo "Indication Support" $INDICATION_SUPPORT
+echo "Test Suite Support" $TESTSUITE_SUPPORT
+if test x"$TESTSUITEDIR" != x; then
+echo "TESTSUITEDIR " $TESTSUITEDIR
+fi
 echo "-------------------------------------------------------"
 
 AC_OUTPUT

--- NEW FILE: README.TEST ---
Test Environment for SBLIM Base Instrumentation

The SBLIM project offers a Test Suite to perform tests against
the provider implementation and consistence tests against system
values.

Prerequisites 
.............

- sblim-cmpi-base package propertly installed
- testsuite package


Pepare Test
...........

done automatically during configure


Install Configuration Files
...........................

done during make install


Run Test
........

Run the test in the testsuite directory (typically /usr/share/sblim-testsuite)
by executing 
. test-cmpi-base.sh
echo Status: $SBLIM_TESTSUITE_RUN

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	11 Apr 2005 14:24:00 -0000	1.2
+++ Makefile.am	13 Apr 2005 13:01:11 -0000	1.3
@@ -170,3 +170,39 @@
 
 dist-hook:
 	test -d "$(distdir)" &&	rm -rf `find $(distdir) -type d -name CVS`
+
+#
+# Automake instructions for ./test subdir
+#
+EXTRA_DIST+=test
+if TESTSUITE
+testsuitedir=@TESTSUITEDIR@
+testsuitesystemdir=@TESTSUITEDIR@/system/linux
+testsuitecimdir=@TESTSUITEDIR@/cim
+
+testsuite_SCRIPTS=test/test-cmpi-base.sh
+testsuitesystem_DATA=test/system/linux/Linux_CSProcessor.system \
+	test/system/linux/Linux_ComputerSystem.system \
+	test/system/linux/Linux_OSProcess.system \
+	test/system/linux/Linux_OperatingSystem.system \
+	test/system/linux/Linux_Processor.system \
+	test/system/linux/Linux_RunningOS.system \
+	test/system/linux/Linux_UnixProcess.system 
+testsuitesystem_SCRIPTS=test/system/linux/Linux_OperatingSystem.version.sh \
+	test/system/linux/Linux_Processor.pl \
+	test/system/linux/Linux_UnixProcess.pl \
+	test/system/linux/createKeyFiles.sh 
+testsuitecim_DATA=test/cim/Linux_CSProcessor.cim \
+	test/cim/Linux_ComputerSystem.cim \
+	test/cim/Linux_OSProcess.cim \
+	test/cim/Linux_OperatingSystem.cim \
+	test/cim/Linux_Processor.cim \
+	test/cim/Linux_RunningOS.cim \
+	test/cim/Linux_UnixProcess.cim
+
+runtest: install
+	cd $(DESTDIR)$(TESTSUITEDIR) &&	./test-cmpi-base.sh
+
+doc_DATA+=README.TEST
+EXTRA_DIST+=README.TEST
+endif

[Sblim-commit] cmpi-base ChangeLog,1.2,1.3

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19527

Modified Files:
	ChangeLog 
Log Message:
bug# 1181317: fixed sample indication filter in test/indication
directory. Filter was still for old Linux_OperatingSystemIndication
class, but should be for CIM_InstModification


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	8 Apr 2005 08:18:37 -0000	1.2
+++ ChangeLog	12 Apr 2005 08:19:08 -0000	1.3
@@ -69,3 +69,10 @@
   PPC
 
 // ===================================================================
+// new in version 1.4.4 :
+
+* bug# 1181317: fixed sample indication filter in test/indication
+  directory. Filter was still for old Linux_OperatingSystemIndication
+  class, but should be for CIM_InstModification
+
+// ===================================================================

[Sblim-commit] cmpi-base/test/indication PegasusCreateFilter.localhost.xml,1.1,1.2

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base/test/indication
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19527/test/indication

Modified Files:
	PegasusCreateFilter.localhost.xml 
Log Message:
bug# 1181317: fixed sample indication filter in test/indication
directory. Filter was still for old Linux_OperatingSystemIndication
class, but should be for CIM_InstModification


Index: PegasusCreateFilter.localhost.xml
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/test/indication/PegasusCreateFilter.localhost.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PegasusCreateFilter.localhost.xml	17 Mar 2005 08:39:54 -0000	1.1
+++ PegasusCreateFilter.localhost.xml	12 Apr 2005 08:19:09 -0000	1.2
@@ -22,7 +22,7 @@
               <VALUE>OperatingSystemFilter0</VALUE>
             </PROPERTY>
             <PROPERTY NAME="Query" TYPE="string"> 
-              <VALUE> SELECT * FROM Linux_OperatingSystemIndication
+              <VALUE> SELECT * FROM CIM_InstModification
               </VALUE>
             </PROPERTY>
             <PROPERTY NAME="QueryLanguage" TYPE="string"> 

[Sblim-commit] sfcb classProvider.c,1.7,1.8

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17104

Modified Files:
	classProvider.c 
Log Message:
Fixed 1181080.
Now generating msg when no repository directory is found. 


Index: classProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/classProvider.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- classProvider.c	11 Apr 2005 23:13:41 -0000	1.7
+++ classProvider.c	12 Apr 2005 08:14:14 -0000	1.8
@@ -331,7 +331,7 @@
    return 0;
 }
 
-static UtilHashTable *gatherNameSpaces(char *dn, UtilHashTable *ns)
+static UtilHashTable *gatherNameSpaces(char *dn, UtilHashTable *ns, int first)
 {
    DIR *dir;
    struct dirent *de;
@@ -346,7 +346,7 @@
    }          
        
    dir=opendir(dn);
-   while ((de=readdir(dir))!=NULL) {
+   if (dir) while ((de=readdir(dir))!=NULL) {
       if (de->d_type==DT_DIR) {
          if (strcmp(de->d_name,".")==0) continue;
          if (strcmp(de->d_name,"..")==0) continue;
@@ -358,10 +358,13 @@
          cr=newClassRegister(n);
          if (cr) {
             ns->ft->put(ns, n+nsBaseLen, cr);
-            gatherNameSpaces(n,ns);
+            gatherNameSpaces(n,ns,0);
          }   
       } 
    }
+   else if (first) {
+      fprintf(stderr,"--- Repository %s not found\n",dn);
+   }
    closedir(dir);  
    return ns;     
 } 
@@ -381,7 +384,7 @@
    strcpy(dn,dir);
    if (dir[strlen(dir)-1]!='/') strcat(dn,"/");
    strcat(dn,"repository");
-   return gatherNameSpaces(dn,NULL);   
+   return gatherNameSpaces(dn,NULL,1);   
 }    
 
 

[Sblim-commit] sfcb providerRegister.c,1.4,1.5

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7709

Modified Files:
	providerRegister.c 
Log Message:
Fixed 1181046.

sfcbd cannot work without a providerRegister file containing at least classProvider definitions.
Changes are made in providerRegister.c to exit when no providerRegsiter file is found.
 


Index: providerRegister.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerRegister.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- providerRegister.c	30 Mar 2005 12:30:51 -0000	1.4
+++ providerRegister.c	12 Apr 2005 07:57:08 -0000	1.5
@@ -75,117 +75,116 @@
    strcpy(fin, dir);
    strcat(fin, "/providerRegister");
    in = fopen(fin, "r");
-   if (in == NULL) {
+   if (in == NULL) 
       fprintf(stderr, "--- %s not found\n", fin);
-      return NULL;
-   }
+      
+   else {
 
-   br->hdl = bb;
-   br->ft = ProviderRegisterFT;
-   bb->fn = strdup(fin);
-   bb->ht = UtilFactory->newHashTable(61,
-               UtilHashTable_charKey | UtilHashTable_ignoreKeyCase);
+      br->hdl = bb;
+      br->ft = ProviderRegisterFT;
+      bb->fn = strdup(fin);
+      bb->ht = UtilFactory->newHashTable(61,
+                  UtilHashTable_charKey | UtilHashTable_ignoreKeyCase);
 
-   while (fgets(fin, 1024, in)) {
-      n++;
-      if (stmt)
-         free(stmt);
-      stmt = strdup(fin);
-      switch (cntlParseStmt(fin, &rv)) {
-      case 0:
-         printf("--- registration statement not recognized: \n\t%d: %s\n", n,
-                stmt);
-         err = 1;
-         break;
-      case 1:
-         if (info) {
-            if (classProvInfoPtr==NULL) {
-               if (strcmp(info->className,"$ClassProvider$")==0) classProvInfoPtr=info;
-            }   
-            else if (defaultProvInfoPtr==NULL) {
-               if (strcmp(info->className,"$DefaultProvider$")==0) defaultProvInfoPtr=info;
-            }   
-            else if (interOpProvInfoPtr==NULL) {
-               if (strcmp(info->className,"$InterOpProvider$")==0) {
-                  if (exFlags & 2) interOpProvInfoPtr=info;
-                  else interopFound=1;
+      while (fgets(fin, 1024, in)) {
+         n++;
+         if (stmt) free(stmt);
+         stmt = strdup(fin);
+         switch (cntlParseStmt(fin, &rv)) {
+         case 0:
+            printf("--- registration statement not recognized: \n\t%d: %s\n", n,stmt);
+            err = 1;
+            break;
+         case 1:
+            if (info) {
+               if (classProvInfoPtr==NULL) {
+                  if (strcmp(info->className,"$ClassProvider$")==0) classProvInfoPtr=info;
                }   
-            }   
-            bb->ht->ft->put(bb->ht, info->className, info);
-         }
-         info = (ProviderInfo *) calloc(1, sizeof(ProviderInfo));
-         info->className = strdup(rv.id);
-         info->id= ++id;
-         break;
-      case 2:
-         if (strcmp(rv.id, "provider") == 0)
-            info->providerName = strdup(cntlGetVal(&rv));
-         else if (strcmp(rv.id, "location") == 0)
-            info->location = strdup(cntlGetVal(&rv));
-         else if (strcmp(rv.id, "group") == 0)
-            info->group = strdup(cntlGetVal(&rv));
-         else if (strcmp(rv.id, "unload") == 0) {
-            char *u;
-            info->unload = 0;
-            while ((u = cntlGetVal(&rv)) != NULL) {
-               if (strcmp(u, "never") == 0) {
-                  info->unload =-1;
+               else if (defaultProvInfoPtr==NULL) {
+                  if (strcmp(info->className,"$DefaultProvider$")==0) defaultProvInfoPtr=info;
+               }   
+               else if (interOpProvInfoPtr==NULL) {
+                  if (strcmp(info->className,"$InterOpProvider$")==0) {
+                     if (exFlags & 2) interOpProvInfoPtr=info;
+                     else interopFound=1;
+                  }   
+               }   
+               bb->ht->ft->put(bb->ht, info->className, info);
+            }
+            info = (ProviderInfo *) calloc(1, sizeof(ProviderInfo));
+            info->className = strdup(rv.id);
+            info->id= ++id;
+            break;
+         case 2:
+            if (strcmp(rv.id, "provider") == 0)
+               info->providerName = strdup(cntlGetVal(&rv));
+            else if (strcmp(rv.id, "location") == 0)
+               info->location = strdup(cntlGetVal(&rv));
+            else if (strcmp(rv.id, "group") == 0)
+               info->group = strdup(cntlGetVal(&rv));
+            else if (strcmp(rv.id, "unload") == 0) {
+               char *u;
+               info->unload = 0;
+               while ((u = cntlGetVal(&rv)) != NULL) {
+                  if (strcmp(u, "never") == 0) {
+                     info->unload =-1;
+                  }   
+                  else {
+                     printf("--- invalid unload specification: \n\t%d: %s\n", n, stmt);
+                     err = 1;
+                  }
                }   
-               else {
-                  printf("--- invalid unload specification: \n\t%d: %s\n", n, stmt);
-                  err = 1;
-               }
             }   
-         }   
-         else if (strcmp(rv.id, "type") == 0) {
-            char *t;
-            info->type = 0;
-            while ((t = cntlGetVal(&rv)) != NULL) {
-               if (strcmp(t, "instance") == 0)
-                  info->type |= INSTANCE_PROVIDER;
-               else if (strcmp(t, "association") == 0)
-                  info->type |= ASSOCIATION_PROVIDER;
-               else if (strcmp(t, "method") == 0)
-                  info->type |= METHOD_PROVIDER;
-               else if (strcmp(t, "indication") == 0)
-                  info->type |= INDICATION_PROVIDER;
-               else if (strcmp(t, "class") == 0)
-                  info->type |= CLASS_PROVIDER;
-               else {
-                  printf("--- invalid type specification: \n\t%d: %s\n", n, stmt);
-                  err = 1;
-               }
+            else if (strcmp(rv.id, "type") == 0) {
+               char *t;
+               info->type = 0;
+               while ((t = cntlGetVal(&rv)) != NULL) {
+                  if (strcmp(t, "instance") == 0)
+                     info->type |= INSTANCE_PROVIDER;
+                  else if (strcmp(t, "association") == 0)
+                     info->type |= ASSOCIATION_PROVIDER;
+                  else if (strcmp(t, "method") == 0)
+                     info->type |= METHOD_PROVIDER;
+                  else if (strcmp(t, "indication") == 0)
+                     info->type |= INDICATION_PROVIDER;
+                  else if (strcmp(t, "class") == 0)
+                     info->type |= CLASS_PROVIDER;
+                  else {
+                     printf("--- invalid type specification: \n\t%d: %s\n", n, stmt);
+                     err = 1;
+                     }
             }
-         }
-         else if (strcmp(rv.id, "namespace") == 0) {
-            int max=1,next=0;
-            char *t;
-            info->ns=(char**)malloc(sizeof(char*)*(max+1));
-            while ((t = cntlGetVal(&rv)) != NULL) {
-               if (next==max) {
-                  max++;
-                  info->ns=(char**)realloc(info->ns,sizeof(char*)*(max+1));
+            }
+            else if (strcmp(rv.id, "namespace") == 0) {
+               int max=1,next=0;
+               char *t;
+               info->ns=(char**)malloc(sizeof(char*)*(max+1));
+               while ((t = cntlGetVal(&rv)) != NULL) {
+                  if (next==max) {
+                     max++;
+                     info->ns=(char**)realloc(info->ns,sizeof(char*)*(max+1));
+                  }
+                  info->ns[next]=strdup(t);
+                  info->ns[++next]=NULL;
                }
-               info->ns[next]=strdup(t);
-               info->ns[++next]=NULL;
             }
+            else {
+               printf("--- invalid registration statement: \n\t%d: %s\n", n, stmt);
+               err = 1;
+            }
+            break;
+         case 3:
+            break;
          }
-         else {
-            printf("--- invalid registration statement: \n\t%d: %s\n", n, stmt);
-            err = 1;
-         }
-         break;
-      case 3:
-         break;
       }
-   }
 
-   if (info) {
-      bb->ht->ft->put(bb->ht, info->className, info);
-   }
+      if (info) {
+         bb->ht->ft->put(bb->ht, info->className, info);
+      }
+   }   
 
    if (classProvInfoPtr==NULL) {
-      printf("--- Class provider definition not found\n");
+      printf("--- Class provider definition not found - sfcbd will terminate\n");
       err=1;
    }
    
@@ -202,7 +201,7 @@
    
    if (err) {
       printf("--- Broker terminated because of previous error(s)\n");
-      abort();
+      exit(5);
    }
    if (stmt) free(stmt);
    return br;