From: Adam Dickmeiss Date: Tue, 30 Jun 2009 10:15:25 +0000 (+0200) Subject: Renamed class Yaz_bw to TimeStat X-Git-Tag: v1.1.3~3 X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=commitdiff_plain;h=1a5ef336a2700bc8399f43a473ffc49bd81f37c8 Renamed class Yaz_bw to TimeStat --- diff --git a/include/yazpp/Makefile.am b/include/yazpp/Makefile.am index 9b76856..2807dbd 100644 --- a/include/yazpp/Makefile.am +++ b/include/yazpp/Makefile.am @@ -1,6 +1,6 @@ pkginclude_HEADERS = \ - bw.h \ + timestat.h \ gdu.h \ gduqueue.h \ ir-assoc.h \ diff --git a/include/yazpp/bw.h b/include/yazpp/bw.h deleted file mode 100644 index 56dcae0..0000000 --- a/include/yazpp/bw.h +++ /dev/null @@ -1,59 +0,0 @@ -/* This file is part of the yazpp toolkit. - * Copyright (C) 1998-2009 Index Data and Mike Taylor - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * 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. - * * Neither the name of Index Data nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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. - */ - - -#ifndef YAZPP_BW_H -#define YAZPP_BW_H - -#include - -namespace yazpp_1 { - class YAZ_EXPORT Yaz_bw { - public: - Yaz_bw(int sz); - ~Yaz_bw(); - void add_bytes(int m); - int get_total(); - private: - long m_sec; // time of most recent bucket - int *m_bucket; - int m_ptr; - int m_size; - }; -} - -#endif - -/* - * Local variables: - * c-basic-offset: 4 - * c-file-style: "Stroustrup" - * indent-tabs-mode: nil - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ - diff --git a/include/yazpp/limit-connect.h b/include/yazpp/limit-connect.h index 5ab55f9..9457dd8 100644 --- a/include/yazpp/limit-connect.h +++ b/include/yazpp/limit-connect.h @@ -29,7 +29,6 @@ #define YAZPP_LIMIT_CONNECT_H #include -#include namespace yazpp_1 { class YAZ_EXPORT LimitConnect { diff --git a/include/yazpp/timestat.h b/include/yazpp/timestat.h new file mode 100644 index 0000000..770ee4a --- /dev/null +++ b/include/yazpp/timestat.h @@ -0,0 +1,60 @@ +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2009 Index Data and Mike Taylor + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * 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. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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. + */ + + +#ifndef YAZPP_TIMESTAT_H +#define YAZPP_TIMESTAT_H + +#include +#include + +namespace yazpp_1 { + class YAZ_EXPORT TimeStat { + public: + TimeStat(int period); + ~TimeStat(); + void add_bytes(int m); + int get_total(); + private: + time_t m_sec; // time of most recent bucket + int *m_bucket; + int m_ptr; + int m_size; + }; +} + +#endif + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ + diff --git a/src/Makefile.am b/src/Makefile.am index 14e145c..6266b94 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ libyazpp_la_SOURCES=socket-observer.cpp pdu-observer.cpp query.cpp \ yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \ yaz-z-server-ill.cpp yaz-z-server-update.cpp yaz-z-databases.cpp \ yaz-z-cache.cpp yaz-cql2rpn.cpp gdu.cpp gduqueue.cpp \ - bw.cpp limit-connect.cpp + timestat.cpp limit-connect.cpp yaz_my_client_SOURCES=yaz-my-client.cpp diff --git a/src/bw.cpp b/src/bw.cpp deleted file mode 100644 index 17cdff5..0000000 --- a/src/bw.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* This file is part of the yazpp toolkit. - * Copyright (C) 1998-2009 Index Data and Mike Taylor - * All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * 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. - * * Neither the name of Index Data nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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. - */ - -#include -#include - -using namespace yazpp_1; - -Yaz_bw::Yaz_bw(int sz) -{ - m_sec = 0; - m_size = sz; - m_bucket = new int[m_size]; - m_ptr = 0; -} - -Yaz_bw::~Yaz_bw() -{ - delete [] m_bucket; -} - -int Yaz_bw::get_total() -{ - add_bytes(0); - int bw = 0; - int i; - for (i = 0; i= m_sec) - { - int d = now - m_sec; - if (d > m_size) - d = m_size; - while (--d >= 0) - { - if (++m_ptr == m_size) - m_ptr = 0; - m_bucket[m_ptr] = 0; - } - m_bucket[m_ptr] += b; - } - m_sec = now; -} - -/* - * Local variables: - * c-basic-offset: 4 - * c-file-style: "Stroustrup" - * indent-tabs-mode: nil - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ - diff --git a/src/limit-connect.cpp b/src/limit-connect.cpp index 3b63759..1568ff4 100644 --- a/src/limit-connect.cpp +++ b/src/limit-connect.cpp @@ -30,6 +30,7 @@ #include #include #include +#include using namespace yazpp_1; @@ -41,7 +42,7 @@ struct LimitConnect::Peer { void add_connect(); char *m_peername; - Yaz_bw m_bw; + TimeStat m_bw; Peer *m_next; }; diff --git a/src/timestat.cpp b/src/timestat.cpp new file mode 100644 index 0000000..ce5def9 --- /dev/null +++ b/src/timestat.cpp @@ -0,0 +1,83 @@ +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2009 Index Data and Mike Taylor + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * 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. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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. + */ + +#include + +using namespace yazpp_1; + +TimeStat::TimeStat(int sz) +{ + m_sec = 0; + m_size = sz; + m_bucket = new int[m_size]; + m_ptr = 0; +} + +TimeStat::~TimeStat() +{ + delete [] m_bucket; +} + +int TimeStat::get_total() +{ + add_bytes(0); + int bw = 0; + int i; + for (i = 0; i= m_sec) + { + int d = now - m_sec; + if (d > m_size) + d = m_size; + while (--d >= 0) + { + if (++m_ptr == m_size) + m_ptr = 0; + m_bucket[m_ptr] = 0; + } + m_bucket[m_ptr] += b; + } + m_sec = now; +} + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ + diff --git a/win/makefile b/win/makefile index b88fbee..65d479b 100644 --- a/win/makefile +++ b/win/makefile @@ -139,7 +139,7 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS) # Source and object modules DLL_OBJS = \ - "$(OBJDIR)\bw.obj" \ + "$(OBJDIR)\timestat.obj" \ "$(OBJDIR)\gdu.obj" \ "$(OBJDIR)\gduqueue.obj" \ "$(OBJDIR)\limit-connect.obj" \