(file) Return to valueFactory.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Compiler

File: [Pegasus] / pegasus / src / Pegasus / Compiler / valueFactory.cpp (download)
Revision: 1.40, Fri Oct 19 17:45:59 2007 UTC (16 years, 8 months ago) by dmitry.mikulin
Branch: MAIN
CVS Tags: TASK_PEP328_SOLARIS_NEVADA_PORT, TASK-PEP328_SOLARIS_NEVADA_PORT-root, TASK-PEP328_SOLARIS_NEVADA_PORT-branch, TASK-PEP328_SOLARIS_IX86_CC_PORT-root, TASK-PEP328_SOLARIS_IX86_CC_PORT-branch-v2, TASK-PEP328_SOLARIS_IX86_CC_PORT-branch, TASK-BUG7146_SqlRepositoryPrototype-root, TASK-BUG7146_SqlRepositoryPrototype-merged_out_to_branch, TASK-BUG7146_SqlRepositoryPrototype-merged_out_from_trunk, TASK-BUG7146_SqlRepositoryPrototype-merged_in_to_trunk, TASK-BUG7146_SqlRepositoryPrototype-merged_in_from_branch, TASK-BUG7146_SqlRepositoryPrototype-branch, RELEASE_2_8_2-RC1, RELEASE_2_8_2, RELEASE_2_8_1-RC1, RELEASE_2_8_1, RELEASE_2_8_0_BETA, RELEASE_2_8_0-RC2, RELEASE_2_8_0-RC1, RELEASE_2_8_0-FC, RELEASE_2_8_0, RELEASE_2_8-root, RELEASE_2_8-branch
Changes since 1.39: +45 -45 lines
BUG#: 6973
TITLE: Memory leaks in MOF compiler.
DESCRIPTION: Added a delete of CIMClient in the cimmofClient destructor. It was allocated in the initialization code, but never deleted.  In  valueFactory::_buildArrayValue() arrays were dynamically allocated and passed to CIMValue's constructor, but never deleted afterwards. Changed it to use automatic stack variables instead.

//%2006////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
// IBM Corp.; EMC Corporation, The Open Group.
// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
// EMC Corporation; VERITAS Software Corporation; The Open Group.
// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
// EMC Corporation; Symantec Corporation; The Open Group.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
//==============================================================================
//
//%/////////////////////////////////////////////////////////////////////////////

//
// implementation of valueFactory
//

#include <cstring>
#include <cstdlib>
#include <Pegasus/Common/Config.h>
#include <Pegasus/Common/AutoPtr.h>
#include <Pegasus/Common/String.h>
#include <Pegasus/Common/StringConversion.h>
#include "cimmofMessages.h"
#include "cimmofParser.h"  /* unfortunately.  Now that valueFactory needs
                              to know about cimmofParser, it might as well
                              be rolled into it. */
#include "valueFactory.h"

// put any debug include, I'd say about here

#define local_min(a,b) ( a < b ? a : b )
#define local_max(a,b) ( a > b ? a : b )

/* Fix up a string with embedded comma with extra
   escape character and return the result. This is a hack
   to get around the problem that arrays having strings
   with an embedded comma are treat the embedded comma
   as an array item separator.
   NOTE: The correct solution is to add a new value factory
   funciton for arrays specifically that uses a different
   separator on an array of values.
   BUG 497 fix, KS Sept 2003
*/
String valueFactory::stringWComma(String tmp)
{
    //String tmp = *$3;
    String rtn = String::EMPTY;
    Uint32 len;
    while((len = tmp.find(',')) != PEG_NOT_FOUND)
    {
        rtn.append(tmp.subString(0,len));
        rtn.append("\\,");
        tmp = tmp.subString(len+1);
    }
    if (tmp.size() > 0)
        rtn.append(tmp);
    return(rtn);
}

Uint64 valueFactory::stringToUint(
    const String &val,
    CIMType type)
{
    Uint64 u64;
    CString valCString = val.getCString();

    Boolean success =
        (StringConversion::decimalStringToUint64(valCString, u64) ||
         StringConversion::hexStringToUint64(valCString, u64) ||
         StringConversion::octalStringToUint64(valCString, u64) ||
         StringConversion::binaryStringToUint64(valCString, u64)) &&
        StringConversion::checkUintBounds(u64, type);

    if (!success)
    {
        String message;
        cimmofMessages::arglist arglist;
        arglist.append(cimTypeToString(type));
        arglist.append(val);
        cimmofMessages::getMessage(
            message, cimmofMessages::INVALID_LITERAL_VALUE, arglist);
        throw Exception(message);
    }

    return u64;
}

Sint64 valueFactory::stringToSint(
    const String &val,
    CIMType type)
{
    Sint64 s64;
    CString valCString = val.getCString();

    Boolean success =
        (StringConversion::stringToSint64(
             valCString, StringConversion::decimalStringToUint64, s64) ||
         StringConversion::stringToSint64(
             valCString, StringConversion::hexStringToUint64, s64) ||
         StringConversion::stringToSint64(
             valCString, StringConversion::octalStringToUint64, s64) ||
         StringConversion::stringToSint64(
             valCString, StringConversion::binaryStringToUint64, s64)) &&
        StringConversion::checkSintBounds(s64, type);

    if (!success)
    {
        String message;
        cimmofMessages::arglist arglist;
        arglist.append(cimTypeToString(type));
        arglist.append(val);
        cimmofMessages::getMessage(
            message, cimmofMessages::INVALID_LITERAL_VALUE, arglist);
        throw Exception(message);
    }

    return s64;
}

Real64 valueFactory::stringToReal(
    const String &val,
    CIMType type)
{
    Real64 r64;
    Boolean success = StringConversion::stringToReal64(val.getCString(), r64);

    if (!success)
    {
        String message;
        cimmofMessages::arglist arglist;
        arglist.append(cimTypeToString(type));
        arglist.append(val);
        cimmofMessages::getMessage(
            message, cimmofMessages::INVALID_LITERAL_VALUE, arglist);
        throw Exception(message);
    }

    return r64;
}

//-------------------------------------------------------------------------
// This is a parser for a comma-separated value String.  It returns one
// value per call.  It handles quoted String and depends on the caller to
// tell it where the end of the String is.
// Returns value in value and return pointing to character after separator
// string
//-------------------------------------------------------------------------
static Uint32 nextcsv(const String &csv, int sep, const Uint32 start,
    const Uint32 end, String &value)
{
    enum parsestate {INDQUOTE, INSQUOTE, NOTINQUOTE};
    value = "";
    Uint32 maxend = local_min(csv.size(), end);
    Uint32 idx = start;
    parsestate state = NOTINQUOTE;
    // ATTN-RK-P3-071702: Added hack to check for null character because Strings
    // were sometimes getting created that included an extra null character.
    while (idx <= maxend && csv[idx])
    {
        char idxchar = csv[idx];
        switch (state)
        {
            case NOTINQUOTE:
                switch (idxchar)
                {
                    case '\\':
                        state = INSQUOTE;
                        break;
                    case '"':
                        state = INDQUOTE;
                        break;
                    default:
                        if (idxchar == sep)
                            return idx + 1;
                        else
                            value.append(idxchar);
                        break;
                }
                break;
            case INSQUOTE:
                value.append(idxchar);
                state = NOTINQUOTE;
                break;
            case INDQUOTE:
                switch (idxchar)
                {
                    case '"':
                        state = NOTINQUOTE;
                        break;
                    default:
                        value.append(idxchar);
                        break;
                }
        }
        idx++;
    }   // end while
    return idx;
}


// ------------------------------------------------------------------
// When the value to be build is of Array type, this routine
// parses out the comma-separated values and builds the array
// -----------------------------------------------------------------
CIMValue* valueFactory::_buildArrayValue(
    CIMType type,
    unsigned int arrayDimension,
    const String& rep)
{
    String sval;
    Uint32 start = 0;
    Uint32 strsize = rep.size();
    Uint32 end = strsize;

    /* KS Changed all of the following from whil {...} to do {...}
     * while (start < end);
     * The combination of the testing and nexcsv meant the last entry was not
     * processed.
     */
    switch (type)
    {
        case CIMTYPE_BOOLEAN:
            {
                Array<Boolean> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        if (sval[0] == 'T')
                            a.append(1);
                        else
                            a.append(0);
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_UINT8:
            {
                Array<Uint8> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Uint8)stringToUint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_SINT8:
            {
                Array<Sint8> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Sint8)stringToSint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_UINT16:
            {
                Array<Uint16> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Uint16)stringToUint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_SINT16:
            {
                Array<Sint16> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Sint16)stringToSint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_UINT32:
            {
                Array<Uint32> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Uint32)stringToUint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_SINT32:
            {
                Array<Sint32> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Sint32)stringToSint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_UINT64:
            {
                Array<Uint64> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Uint64)stringToUint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_SINT64:
            {
                Array<Sint64> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Sint64)stringToSint(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_REAL32:
            {
                Array<Real32> a;
                if (strsize != 0)
                {
                    do
                    {
                        start = nextcsv(rep, ',', start, end, sval);
                        a.append((Real32)stringToReal(sval, type));
                    } while (start < end);
                }
                return new CIMValue(a);
            }
        case CIMTYPE_REAL64:
             {
                 Array<Real64> a;
                 if (strsize != 0)
                 {
                     do
                     {
                         start =
                             nextcsv(rep, ',', start, end, sval);
                         a.append((Real64)stringToReal(sval, type));
                     } while (start < end);
                 }
                 return new CIMValue(a);
             }
        case CIMTYPE_CHAR16:
             {
                 Array<Char16> a;
                 if (strsize != 0)
                 {
                     do
                     {
                         start =
                            nextcsv(rep, ',', start, end, sval);
                         a.append(sval[0]);
                     } while (start < end);
                 }
                 return new CIMValue(a);
             }
        case CIMTYPE_STRING:
             {
                 Array<String> a;
                 if (strsize != 0)
                 {
                     do
                     {
                         start =
                            nextcsv(rep, ',', start, end, sval);
                         a.append(sval);
                     } while (start < end);
                 }
                 return new CIMValue(a);
             }
        case CIMTYPE_DATETIME:
             {
                 Array<CIMDateTime> a;
                 while (strsize &&
                         (start = nextcsv(rep, ',', start, end, sval)) < end )
                 {
                     a.append(CIMDateTime(sval));
                 }
                 return new CIMValue(a);
             }
        case CIMTYPE_REFERENCE:
             break;
             //  PEP 194:
             //  Note that "object" (ie. CIMTYPE_OBJECT) is not a real
             //  CIM datatype, just a Pegasus internal representation
             //  of an embedded object, so it won't be found here.
        case CIMTYPE_OBJECT:
#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
        case CIMTYPE_INSTANCE:
#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
                             break;
    }  // end switch
    return 0;
}

/* ATTN: KS 20 Feb 02 - Think we need to account for NULL value here differently
   They come in as an empty string from devaultValue and if they are an empty
   string we need to create the correct type but without a value in it.
   Easiest may be to test in each converter since otherwise would have to
   create a second switch. Either that or if strlength = zero
   create an empty CIMValue and then put in the type
                CIMValue x;
            x.set(Uint16(9)
*/
//----------------------------------------------------------------
CIMValue * valueFactory::createValue(CIMType type, int arrayDimension,
      Boolean isNULL,
      const String *repp)
{
  const String &rep = *repp;
  //cout << "valueFactory, value = " << rep << endl;
  CIMDateTime dt;
  if (arrayDimension == -1) { // this is not an array type

    if (isNULL)
    {
       return new CIMValue(type, false);
    }

    switch(type) {
    case CIMTYPE_UINT8:  return new CIMValue((Uint8)  stringToUint(rep, type));
    case CIMTYPE_SINT8:  return new CIMValue((Sint8)  stringToSint(rep, type));
    case CIMTYPE_UINT16: return new CIMValue((Uint16) stringToUint(rep, type));
    case CIMTYPE_SINT16: return new CIMValue((Sint16) stringToSint(rep, type));
    case CIMTYPE_UINT32: return new CIMValue((Uint32) stringToUint(rep, type));
    case CIMTYPE_SINT32: return new CIMValue((Sint32) stringToSint(rep, type));
    case CIMTYPE_UINT64: return new CIMValue((Uint64) stringToUint(rep, type));
    case CIMTYPE_SINT64: return new CIMValue((Sint64) stringToSint(rep, type));
    case CIMTYPE_REAL32: return new CIMValue((Real32) stringToReal(rep, type));
    case CIMTYPE_REAL64: return new CIMValue((Real64) stringToReal(rep, type));
    case CIMTYPE_CHAR16: return new CIMValue((Char16) rep[0]);
    case CIMTYPE_BOOLEAN: return new CIMValue((Boolean) (rep[0] == 'T'?1:0));
    case CIMTYPE_STRING: return new CIMValue(rep);
    case CIMTYPE_DATETIME: return new CIMValue(CIMDateTime(rep));
    case CIMTYPE_REFERENCE: return new CIMValue(CIMObjectPath(rep));
//  PEP 194:
//  Note that "object" (ie. CIMTYPE_OBJECT) is not a real CIM datatype, just a
//  Pegasus internal representation of an embedded object, so it won't be
//  found here.
    case CIMTYPE_OBJECT:
#ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
    case CIMTYPE_INSTANCE:
#endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
        break;
    }
    return(new CIMValue((Uint32) 0));    // default
  }
  else
  { // an array type, either fixed or variable

  const String &rep = *repp;
      // KS If empty string set CIMValue type but Null attribute.
      if (isNULL)
          return new CIMValue(type, true, arrayDimension);

    return _buildArrayValue(type, (unsigned int)arrayDimension, rep);
  }
}

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2