X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fstream.h;h=83b1e2d13de3f48f6258886864e55b002257970d;hb=a713b6d9ee850ae5805c05e8336256cea1f71138;hp=558b2790b53c3360a3a03ad1d3260d7c5ad2f62a;hpb=b0ef8cb4b2a4056fc7df7c16aa6a170edb4dea34;p=m6w6%2Flibmemcached

diff --git a/libtest/stream.h b/libtest/stream.h
index 558b2790..83b1e2d1 100644
--- a/libtest/stream.h
+++ b/libtest/stream.h
@@ -1,37 +1,22 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  uTest, libtest
+ *  libtest
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
  *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #pragma once
@@ -51,6 +36,20 @@ template<class Ch, class Tr, class A>
   class cerr {
   private:
 
+  public:
+    typedef std::basic_ostringstream<Ch, Tr, A> stream_buffer;
+
+  public:
+    void operator()(const stream_buffer &s)
+    {
+      std::cerr << s.str() << std::endl;
+    }
+  };
+
+template<class Ch, class Tr, class A>
+  class make_cerr {
+  private:
+
   public:
     typedef std::basic_ostringstream<Ch, Tr, A> stream_buffer;
 
@@ -85,7 +84,7 @@ template<class Ch, class Tr, class A>
   public:
     void operator()(const stream_buffer &s)
     {
-      std::cerr << s.str() << std::endl;
+      std::cerr<< s.str() << std::endl;
     }
   };
 
@@ -95,6 +94,7 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
     typedef OutputPolicy<Ch, Tr, A> output_policy;
     const char *_filename;
     int _line_number;
+    const char *_func;
 
   public:
     log() :
@@ -102,10 +102,11 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
       _line_number(0)
     { }
 
-    void set_filename(const char *filename, int line_number)
+    void set_filename(const char *filename, int line_number, const char *func)
     {
       _filename= filename;
       _line_number= line_number;
+      _func= func;
     }
 
     ~log()
@@ -119,7 +120,7 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
       {
         if (_filename)
         {
-          arg << __FILE__ << ":" << __LINE__ << " ";
+          arg << _filename << ":" << _line_number << ": in " << _func << "() ";
           _filename= NULL;
         }
         arg << x;
@@ -131,35 +132,45 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
   };
 }
 
+class make_cerr : public detail::log<detail::make_cerr> {
+public:
+  make_cerr(const char *filename, int line_number, const char *func)
+  {
+    set_filename(filename, line_number, func);
+  }
+};
+
 class cerr : public detail::log<detail::cerr> {
 public:
-  cerr(const char *filename, int line_number)
+  cerr(const char *filename, int line_number, const char *func)
   {
-    set_filename(filename, line_number);
+    set_filename(filename, line_number, func);
   }
 };
 
 class clog : public detail::log<detail::clog> {
 public:
-  clog(const char *, int)
+  clog(const char *, int, const char*)
   { }
 };
 
 class cout : public detail::log<detail::cout> {
 public:
-  cout(const char *, int)
+  cout(const char *, int, const char *)
   { }
 };
 
 
 } // namespace stream
 
-#define Error stream::cerr(__FILE__, __LINE__)
+#define Error stream::cerr(__FILE__, __LINE__, __func__)
+
+#define Out stream::cout(NULL, __LINE__, __func__)
 
-#define Out stream::cout(NULL, __LINE__)
+#define Outn() stream::cout(NULL, __LINE__, __func__) << " "
 
-#define Log stream::clog(NULL, __LINE__)
+#define Log stream::clog(NULL, __LINE__, __func__)
 
-#define Logn() stream::clog(NULL, __LINE__) << " "
+#define Logn() stream::clog(NULL, __LINE__, __func__) << " "
 
 } // namespace libtest