X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fstream.h;h=ed5a03e541ed0e6090a9a6711c87132dc6dbe1e8;hb=3c4d734f56530d43520f385bff97162c04ac81ac;hp=3ad71b1fddbb528fd4bb4b4b878e06c87b52de0c;hpb=bed5d0baa746d10fd3899be96a6ab8673daa7e03;p=m6w6%2Flibmemcached

diff --git a/libtest/stream.h b/libtest/stream.h
index 3ad71b1f..ed5a03e5 100644
--- a/libtest/stream.h
+++ b/libtest/stream.h
@@ -51,6 +51,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 +99,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,16 +109,19 @@ 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(const char *filename, int line_number) :
-      _filename(filename),
-      _line_number(line_number)
+    log() :
+      _filename(NULL),
+      _line_number(0)
+    { }
+
+    void set_filename(const char *filename, int line_number, const char *func)
     {
-      if (_filename)
-      {
-        arg << _filename << ":" << _line_number << " ";
-      }
+      _filename= filename;
+      _line_number= line_number;
+      _func= func;
     }
 
     ~log()
@@ -116,6 +133,11 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
     template<class T>
       log &operator<<(const T &x)
       {
+        if (_filename)
+        {
+          arg << _filename << ":" << _line_number << ": in " << _func << "() ";
+          _filename= NULL;
+        }
         arg << x;
         return *this;
       }
@@ -125,34 +147,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) :
-    log(filename, line_number)
-  { }
+  cerr(const char *filename, int line_number, const char *func)
+  {
+    set_filename(filename, line_number, func);
+  }
 };
 
 class clog : public detail::log<detail::clog> {
 public:
-  clog(const char *filename, int line_number) :
-    log(filename, line_number)
+  clog(const char *, int, const char*)
   { }
 };
 
 class cout : public detail::log<detail::cout> {
 public:
-  cout(const char *filename, int line_number) :
-    log(filename, line_number)
+  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 Outn() stream::cout(NULL, __LINE__, __func__) << " "
 
-#define Out stream::cout(NULL, __LINE__)
+#define Log stream::clog(NULL, __LINE__, __func__)
 
-#define Log stream::clog(NULL, __LINE__)
+#define Logn() stream::clog(NULL, __LINE__, __func__) << " "
 
 } // namespace libtest