[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/log.cpp libnet/handler.cpp libnet...
From: |
Dossy Shiobara |
Subject: |
[Gnash-commit] gnash libbase/log.cpp libnet/handler.cpp libnet... |
Date: |
Sat, 29 Mar 2008 03:16:06 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Dossy Shiobara <dossy> 08/03/29 03:16:05
Modified files:
libbase : log.cpp
libnet : handler.cpp http.cpp rtmp.cpp
Log message:
Don't call pthread_self() directly, use get_thread_id() instead.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/handler.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/http.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.cpp?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- libbase/log.cpp 28 Mar 2008 21:30:19 -0000 1.72
+++ libbase/log.cpp 29 Mar 2008 03:16:03 -0000 1.73
@@ -28,7 +28,6 @@
#include <iomanip> // for std::setfill
#include <string>
#include <boost/format.hpp>
-#include <pthread.h>
#if defined(_WIN32) && defined(WIN32)
// Required for SYSTEMTIME definitions
@@ -39,6 +38,7 @@
#include <unistd.h> // for getpid
#include "log.h"
+#include "utility.h"
using std::cout;
using std::endl;
@@ -102,8 +102,9 @@
strftime (buf, sizeof(buf), "%H:%M:%S", localtime (&t));
std::stringstream ss;
- ss << pthread_self() << "] " << buf;
+ ss << get_thread_id() << "] " << buf;
return ss.str();
+
}
std::ostream& datetimestamp(std::ostream& x) {
Index: libnet/handler.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/handler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/handler.cpp 28 Mar 2008 21:30:25 -0000 1.2
+++ libnet/handler.cpp 29 Mar 2008 03:16:04 -0000 1.3
@@ -32,6 +32,7 @@
#include "log.h"
#include "network.h"
#include "buffer.h"
+#include "utility.h"
#include "rtmp.h"
#include "http.h"
@@ -175,7 +176,7 @@
_outgoing.setName("Outgoing");
log_debug(_("Starting Handlers for port %d, tid %ld"),
- args->port, pthread_self());
+ args->port, get_thread_id());
if (args->port == 4080) { // FIXME: hack alert!
boost::thread handler(boost::bind(&httphandler, args));
Index: libnet/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/http.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libnet/http.cpp 29 Mar 2008 03:13:12 -0000 1.3
+++ libnet/http.cpp 29 Mar 2008 03:16:04 -0000 1.4
@@ -1192,7 +1192,7 @@
www.setHandler(hand);
log_debug(_("Starting HTTP Handler for fd #%d, tid %ld"),
- args->netfd, pthread_self());
+ args->netfd, get_thread_id());
string docroot = args->filespec;
Index: libnet/rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libnet/rtmp.cpp 28 Mar 2008 21:30:26 -0000 1.2
+++ libnet/rtmp.cpp 29 Mar 2008 03:16:05 -0000 1.3
@@ -32,6 +32,7 @@
#include "rtmp.h"
#include "network.h"
#include "handler.h"
+#include "utility.h"
using namespace amf;
using namespace gnash;
@@ -440,7 +441,7 @@
string docroot = args->filespec;
log_debug(_("Starting RTMP Handler for fd #%d, tid %ld"),
- args->netfd, pthread_self());
+ args->netfd, get_thread_id());
while (!hand->timetodie()) {
log_debug(_("Waiting for RTMP request on fd #%d..."), args->netfd);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash libbase/log.cpp libnet/handler.cpp libnet...,
Dossy Shiobara <=