[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash server/Makefile.am libbase/Makefile.am Ch...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash server/Makefile.am libbase/Makefile.am Ch... |
|
Date: |
Mon, 31 Dec 2007 17:47:54 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/12/31 17:47:54
Modified files:
server : Makefile.am
libbase : Makefile.am
. : ChangeLog
Added files:
libbase : shm.h shm.cpp
Removed files:
server : shm.h shm.cpp
Log message:
* libbase/shm.{cpp,h}: Move from server directory.
* libbase/Makefile.am: Build Shm class here.
* server/shm.{cpp,h}: Move to libbase directory.
* sever/Makefile.am: Don't build Shm class here.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.h?cvsroot=gnash&r1=1.19&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.34&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/shm.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/shm.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5281&r2=1.5282
Patches:
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/Makefile.am 8 Dec 2007 09:11:24 -0000 1.135
+++ server/Makefile.am 31 Dec 2007 17:47:53 -0000 1.136
@@ -15,11 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-
-# $Id: Makefile.am,v 1.135 2007/12/08 09:11:24 strk Exp $
-
AUTOMAKE_OPTIONS =
SUBDIRS = asobj parser vm
@@ -85,7 +80,6 @@
movie_root.cpp \
namedStrings.cpp \
rect.cpp \
- shm.cpp \
sprite_instance.cpp \
swf/TagLoadersTable.cpp \
swf/tag_loaders.cpp \
@@ -170,7 +164,6 @@
render.h \
resource.h \
shape.h \
- shm.h \
sprite_instance.h \
stream.h \
styles.h \
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- libbase/Makefile.am 10 Dec 2007 10:54:33 -0000 1.94
+++ libbase/Makefile.am 31 Dec 2007 17:47:53 -0000 1.95
@@ -88,6 +88,7 @@
network.cpp \
postscript.cpp \
rc.cpp \
+ shm.cpp \
sharedlib.cpp \
string_table.cpp \
tu_file.cpp \
@@ -124,6 +125,7 @@
postscript.h \
rc.h \
ref_counted.h \
+ shm.h \
smart_ptr.h \
sharedlib.h \
string_table.h \
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5281
retrieving revision 1.5282
diff -u -b -r1.5281 -r1.5282
--- ChangeLog 31 Dec 2007 05:53:33 -0000 1.5281
+++ ChangeLog 31 Dec 2007 17:47:53 -0000 1.5282
@@ -1,3 +1,10 @@
+2007-12-31 Rob Savoye <address@hidden>
+
+ * libbase/shm.{cpp,h}: Move from server directory.
+ * libbase/Makefile.am: Build Shm class here.
+ * server/shm.{cpp,h}: Move to libbase directory.
+ * sever/Makefile.am: Don't build Shm class here.
+
2007-12-30 Rob Savoye <address@hidden>
* libamf/sol.cpp: Various tweaks for 64bit big-endian systems,
Index: libbase/shm.h
===================================================================
RCS file: libbase/shm.h
diff -N libbase/shm.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libbase/shm.h 31 Dec 2007 17:47:53 -0000 1.1
@@ -0,0 +1,189 @@
+//
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#ifndef __SHM_H__
+#define __SHM_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string>
+
+//#include "impl.h"
+#include "as_object.h" // for inheritance
+
+#include <sys/types.h>
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
+# include <sys/ipc.h>
+# include <sys/shm.h>
+#elif !defined(__riscos__) && !defined(__OS2__)
+# include <windows.h>
+# include <process.h>
+# include <fcntl.h>
+# include <io.h>
+#endif
+
+// Forward declarations
+namespace gnash {
+ class fn_call;
+}
+
+namespace gnash {
+
+#ifndef MAP_INHERIT
+const int MAP_INHERIT = 0;
+#endif
+#ifndef MAP_HASSEMAPHORE
+const int MAP_HASSEMAPHORE = 0;
+#endif
+
+const int MAX_SHM_NAME_SIZE = 48;
+
+class Shm {
+public:
+
+ DSOEXPORT Shm();
+ DSOEXPORT ~Shm();
+
+ // Initialize the shared memory segment
+ bool attach(char const *filespec, bool nuke);
+
+ // Resize the allocated memory segment
+ bool resize(int bytes);
+ bool resize();
+
+ // Allocate a memory from the shared memory segment
+ void *brk(int bytes);
+
+ // Close the memory segment. This removes it from the system.
+ bool closeMem();
+
+ Shm *cloneSelf(void);
+
+ // Accessors for testing
+ char *getAddr() { return _addr; };
+ char *getName() { return _filespec; };
+ size_t getSize() { return _size; };
+ int getAllocated() { return _alloced; };
+ bool exists();
+protected:
+ char *_addr;
+ long _alloced;
+ size_t _size;
+ char _filespec[MAX_SHM_NAME_SIZE];
+#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
+ key_t _shmkey;
+#else
+ long _shmkey;
+ HANDLE _shmhandle;
+#endif
+ int _shmfd;
+};
+
+// Custome memory allocator for the shared memory segment
+template<typename _Tp>
+class ShmAlloc
+{
+private:
+ Shm *mmptr;
+ Shm mem;
+public:
+ typedef size_t size_type;
+ typedef ptrdiff_t difference_type;
+ typedef _Tp* pointer;
+ typedef const _Tp* const_pointer;
+ typedef _Tp& reference;
+ typedef const _Tp& const_reference;
+ typedef _Tp value_type;
+
+ template<typename _Tp1>
+ struct rebind
+ { typedef ShmAlloc<_Tp1> other; };
+
+ ShmAlloc() throw() { }
+
+ ShmAlloc(const ShmAlloc& other) throw()
+ : mem(other.mem)
+ { }
+
+ template<typename _Tp1>
+ ShmAlloc(const ShmAlloc<_Tp1>& other) throw()
+ : mem(other.mem)
+ { }
+
+ ~ShmAlloc() throw() { }
+
+ pointer
+ address(reference __x) const { return &__x; }
+
+ const_pointer
+ address(const_reference __x) const { return &__x; }
+
+ // Allocate memory
+ _Tp*
+ allocate(size_type n, const void* p = 0) {
+ // If the memory manager has no blocks, it hasn't been
+ // initialized.
+// if (mminit == false) {
+// mmptr = mem.initMemManager(true);
+// mminit = true;
+// } else {
+// mmptr = mem.initMemManager(false);
+// }
+
+ _Tp* ret = 0;
+ if (n) {
+ ret = (_Tp*)mmptr->brk(n * sizeof(_Tp));
+ if (ret == 0)
+ throw std::bad_alloc();
+ }
+ return ret;
+ }
+
+ // Deallocate memory
+ void
+ deallocate(pointer __p, size_type __n) {
+ //mmptr->free(__p);
+ }
+
+ void construct(pointer __p, const _Tp& __val) {
+ new(__p) _Tp(__val);
+ }
+ void destroy(pointer __p) { __p->~_Tp(); }
+};
+
+class shm_as_object : public as_object
+{
+public:
+ Shm obj;
+};
+
+as_value shm_getname(const fn_call& fn);
+as_value shm_getsize(const fn_call& fn);
+as_value shm_getallocated(const fn_call& fn);
+as_value shm_exists(const fn_call& fn);
+
+} // end of gnash namespace
+
+// end of __SHM_H__
+#endif
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: libbase/shm.cpp
===================================================================
RCS file: libbase/shm.cpp
diff -N libbase/shm.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libbase/shm.cpp 31 Dec 2007 17:47:53 -0000 1.1
@@ -0,0 +1,526 @@
+//
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <fcntl.h>
+#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
+#include <sys/mman.h>
+#include <sys/shm.h>
+#include <sys/ipc.h>
+#elif !defined(__riscos__) && !defined(__OS2__)
+#include <windows.h>
+#include <process.h>
+#include <io.h>
+#endif
+#include <string>
+#include <vector>
+#include <cerrno>
+
+#include "log.h"
+#include "shm.h"
+
+namespace {
+gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
+}
+
+using namespace std;
+
+namespace gnash {
+
+const int DEFAULT_SHM_SIZE = 64528;
+
+#ifdef darwin
+# ifndef MAP_INHERIT
+# define MAP_INHERIT 0
+#endif
+#ifndef PROT_EXEC
+# define PROT_EXEC
+# endif
+#endif
+
+#ifndef _SC_PAGESIZE
+#define _SC_PAGESIZE 8
+#endif
+
+#define FLAT_ADDR_SPACE 1
+
+ Shm::Shm() :_addr(0), _alloced(0), _size(0), _shmkey(0), _shmfd(0)
+{
+ memset(_filespec, 0, MAX_SHM_NAME_SIZE);
+}
+
+Shm::~Shm()
+{
+}
+
+/// \brief Initialize the shared memory segment
+///
+/// This creates or attaches to an existing shared memory segment.
+bool
+Shm::attach(char const *filespec, bool nuke)
+{
+ bool exists = false;
+ long addr;
+ // #ifdef FLAT_ADDR_SPACE
+ // off_t off;
+ // #endif
+ Shm *sc;
+ string absfilespec;
+
+ _size = DEFAULT_SHM_SIZE;
+
+#ifdef USE_POSIX_SHM
+#ifdef darwin
+ absfilespec = "/tmp";
+#else
+ absfilespec = "/";
+#endif
+ absfilespec += filespec;
+ filespec = absfilespec.c_str();
+ strncpy(_filespec, absfilespec.c_str(), MAX_SHM_NAME_SIZE);
+ if (static_cast<int>(absfilespec.size()) > MAX_SHM_NAME_SIZE) {
+ log_error("Shared Memory segment name is " SIZET_FMT " bytes too
long!\n",
+ absfilespec.size() - MAX_SHM_NAME_SIZE);
+ }
+
+ // log_msg("%s: Initializing %d bytes of memory for \"%s\"\n",
+ // __PRETTY_FUNCTION__, DEFAULT_SHM_SIZE, absfilespec.c_str());
+
+ // Adjust the allocated amount of memory to be on a page boundary.
+ // We can only do this on POSIX systems, so for braindead win32,
+ // don't readjust the size.
+#ifdef HAVE_SYSCONF
+ long pageSize = sysconf(_SC_PAGESIZE);
+ if (_size % pageSize) {
+ _size += pageSize - _size % pageSize;
+// log_msg("Adjusting segment size to %d to be page aligned.\n", _size);
+ }
+#endif
+
+ errno = 0;
+#ifdef HAVE_SHM_OPEN
+ // Create the shared memory segment
+ _shmfd = shm_open(filespec, O_RDWR|O_CREAT|O_EXCL|O_TRUNC,
+ S_IRUSR|S_IWUSR);
+ if (_shmfd < 0 && errno == EEXIST)
+#else
+#error "You need POSIX Shared memory support to use this option"
+#endif
+#endif // USE_POSIX_SHM
+
+#ifdef USE_SYSV_SHM
+# ifdef HAVE_SHMGET
+ const int shmflg = 0660 | IPC_CREAT;
+ // this is the magic size of shared memory segments used by the other
flash player;
+ _size = 64528;
+ // this is the magic shared memory key used by the other player.
+ _shmkey = rcfile.getLCShmKey();
+ // If there is no SYSV style shared memory key in the users ~/.gnashrc
file, warn them
+ // that compatibility will be broken, and then just pick our own key so
things still work
+ // finer when using just Gnash.
+ if (_shmkey == 0) {
+ log_error("No Shared Memory key specified in ~/.gnashrc! Please run
\"dumpshm -i\" to find your key if you want to be conpatible with the other swf
player.");
+ _shmkey = 0xdd3adabd;
+ }
+
+ filespec = "default"; // this is unused for sysv memory segments
+ _shmfd = shmget(_shmkey, _size, shmflg);
+ if (_shmfd < 0 && errno == EEXIST)
+# else
+# ifdef __riscos__
+ if (0)
+# else
+ _shmhandle = CreateFileMapping ((HANDLE) 0xFFFFFFFF, NULL,
+ PAGE_READWRITE, 0,
+ _size, filespec);
+ if (_shmhandle <= 0)
+# endif
+# endif // end of HAVE_SHMGET
+#else
+#error "You need SYSV Shared memory support to use this option"
+#endif // end of USE_SYSV_SHM
+ {
+ // If it already exists, then just attach to it.
+ exists = true;
+ log_msg("Shared Memory segment \"%s\" already exists\n",
+ filespec);
+#ifdef USE_POSIX_SHM
+// shm_unlink(filespec);
+ _shmfd = shm_open(filespec, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+#else
+# ifdef USE_SYSV_SHM
+ // Get the shared memory id for this segment
+ _shmfd = shmget(_shmkey, _size, 0);
+# else
+# ifdef __riscos__
+ // do nothing, we never get here.
+# else
+ _shmhandle = CreateFileMapping ((HANDLE) 0xFFFFFFFF, NULL,
+ PAGE_READWRITE, 0,
+ _size, filespec);
+# endif
+#endif
+#endif
+ }
+
+ // MacOSX returns this when you use O_EXCL for shm_open() instead
+ // of EEXIST
+#if defined(HAVE_SHMGET) || defined(HAVE_SHM_OPEN)
+ if (_shmfd < 0 && errno == EINVAL)
+#else
+# ifdef __riscos__
+ if (0)
+# else
+ if (_shmhandle <= 0 && errno == EINVAL)
+#endif
+#endif
+ {
+ exists = true;
+ log_msg(
+#ifdef USE_POSIX_SHM
+ "WARNING: shm_open() failed, retrying: %s\n",
+#else
+# ifdef USE_SYSV_SHM
+ "WARNING: shmget() failed, retrying: %s\n",
+# else
+ "WARNING: CreateFileMapping() failed, retrying: %s\n",
+# endif
+#endif
+ strerror(errno));
+// fd = shm_open(filespec, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+ return false;
+ }
+
+ // We got the file descriptor, now map it into our process.
+#if defined(HAVE_SHMGET) || defined(HAVE_SHM_OPEN)
+ if (_shmfd >= 0)
+#else
+# ifdef __riscos__
+ if (1)
+# else
+ if (_shmhandle >= 0)
+#endif
+#endif
+ {
+#ifdef USE_POSIX_SHM
+ if (!exists) {
+ // Set the size so we can write to new segment
+ ftruncate(_shmfd, _size);
+ }
+ _addr = static_cast<char *>(mmap(0, _size,
+ PROT_READ|PROT_WRITE,
+
MAP_SHARED|MAP_INHERIT|MAP_HASSEMAPHORE,
+ _shmfd, 0));
+ if (_addr == MAP_FAILED) {
+ log_msg("WARNING: mmap() failed: %s\n", strerror(errno));
+ return false;
+ }
+#else // else of HAVE_SHM_OPEN
+# ifdef HAVE_SHMAT
+ _addr = (char *)shmat(_shmfd, 0, 0);
+ if (_addr <= 0) {
+ log_msg("WARNING: shmat() failed: %s\n", strerror(errno));
+ return false;
+ }
+# else
+# ifdef __riscos__
+ _addr = (char *)malloc(_size);
+ if (_addr == 0) {
+ log_msg("WARNING: malloc() failed\n");
+ return false;
+ }
+# else
+ _addr = (char *)MapViewOfFile (_shmhandle, FILE_MAP_ALL_ACCESS,
+ 0, 0, _size);
+# endif
+#endif
+#endif
+// log_msg("The address to the shared memory segment is: %p", _addr);
+ if (exists && !nuke) {
+ // If there is an existing memory segment that we don't
+ // want to trash, we just want to attach to it. We know
+ // that a Shm data class has been instantiated in
+ // the base of memory, and the first field is the address
+ // used for the previous mmap(), so we grab that value,
+ // unmap the old address, and map the original address
+ // into this process. This is done so that memory
+ // allocations between processes all have the same
+ // addresses. Otherwise, one can't do globally shared data
+ // among processes that requires any dynamic memory
+ // allocation. All of this is so our custom memory
+ // allocator for STL containers will work.
+ addr = *(reinterpret_cast<long *>(_addr));
+ if (addr == 0) {
+ log_msg("WARNING: No address found in memory segment!\n");
+ nuke = true;
+ } else {
+#ifdef FLAT_ADDR_SPACE
+ log_msg("Adjusting address to 0x%lx\n", addr);
+#ifdef USE_POSIX_SHM
+ munmap(_addr, _size);
+ log_msg("Unmapped address %p\n", _addr);
+#ifdef darwin
+ _addr = static_cast<char *>(mmap(reinterpret_cast<char *>(addr),
+ _size, PROT_READ,
+
MAP_SHARED|MAP_FIXED|MAP_INHERIT|MAP_HASSEMAPHORE,
+ _shmfd, static_cast<off_t>(0)));
+#else
+ // off = (off_t)((long)addr - (long)_addr);
+ _addr = static_cast<char *>(mmap((char *)addr,
+ _size, PROT_READ|PROT_WRITE,
+ MAP_FIXED|MAP_SHARED, _shmfd, 0));
+#endif
+ if (_addr == MAP_FAILED) {
+ log_msg("WARNING: MMAP failed: %s\n", strerror(errno));
+ return static_cast<Shm *>(0);
+ }
+ }
+#else // HAVE_SHM_OPEN
+# ifdef HAVE_SHMAT
+ shmdt(_addr);
+ _addr = (char *)shmat(_shmfd, (void *)addr, 0);
+# else
+# ifdef __riscos__
+ _addr = _addr;
+# else
+ CloseHandle(_shmhandle);
+ _addr = (char *)MapViewOfFile (_shmhandle, FILE_MAP_ALL_ACCESS,
+ 0, 0, _size);
+# endif
+# endif // end of HAVE_SHMAT
+ }
+#endif // end of HAVE_SHM_OPEN
+#else // else of FLAT_ADDR_SPACE
+#endif // end of FLAT_ADDR_SPACE
+
+ log_msg("Opened Shared Memory segment \"%s\": " SIZET_FMT " bytes at
%p.\n",
+ filespec, _size, _addr);
+ }
+
+#ifdef USE_POSIX_SHM
+ if (nuke) {
+ log_msg("Zeroing %d bytes at %p.\n", _size, _addr);
+ // Nuke all the segment, so we don't have any problems
+ // with leftover data.
+ memset(_addr, 0, _size);
+ sc = cloneSelf();
+ } else {
+ sc = reinterpret_cast<Shm *>(_addr);
+ }
+#else
+ sc = reinterpret_cast<Shm *>(_addr);
+#endif
+ } else {
+ log_msg("ERROR: Couldn't open the Shared Memory segment \"%s\"! %s\n",
+ filespec, strerror(errno));
+ return false;
+ }
+
+#ifdef USE_POSIX_SHM
+// don't close it on an error
+ if (_shmfd) {
+ ::close(_shmfd);
+ }
+#endif
+
+ return true;
+}
+
+/// \brief Copy the current data for the shared memory segment to the
+/// head of the segment.
+Shm *
+Shm::cloneSelf(void)
+{
+
+ if (_addr > 0) {
+// log_msg("Cloning ShmControl, %d bytes to %p\n",
+// sizeof(Shm), _addr);
+ // set the allocated bytes before we copy so the value is
+ // correct in both instantiations of this object.
+ _alloced = sizeof(Shm);
+ memcpy(_addr, this, sizeof(Shm));
+ return reinterpret_cast<Shm *>(_addr);
+ }
+
+ log_msg("WARNING: Can't clone Self, address 0x0\n");
+
+ return static_cast<Shm *>(0);
+}
+
+// Resize the allocated memory segment
+bool
+Shm::resize()
+{
+ // Increase the size by 10 %
+ return resize(DEFAULT_SHM_SIZE + (DEFAULT_SHM_SIZE/10));
+}
+
+bool
+Shm::resize(int bytes)
+
+{
+#ifdef HAVE_MREMAP
+ _addr = mremap(_shmAddr, _shmSize, _shmSize + bytes, MREMAP_MAYMOVE);
+ if (_addr != 0) {
+ return true;
+ }
+#else
+ // FIXME: alloc a whole new segment, and copy this one
+ // into it. Yeuch...
+ // Get rid of the compiler warning, this will get optimized out anyway.
+ bytes += 0;
+#endif
+ return false;
+}
+
+// Allocate a memory from the shared memory segment
+void *
+Shm::brk(int bytes)
+{
+ int wordsize = sizeof(long);
+
+ // Adjust the allocated amount of memory to be on a word boundary.
+ if (bytes % wordsize) {
+ int wordsize = sizeof(long);
+
+ // Adjust the allocated amount of memory to be on a word boundary.
+ if (bytes % wordsize) {
+ bytes += wordsize - bytes % wordsize;
+ }
+
+ void *addr = (static_cast<char *>(_addr)) + _alloced;
+
+ log_msg("%s: Allocating %d bytes at %p\n",
+ __PRETTY_FUNCTION__, bytes, addr);
+ // Zero out the block before returning it
+ memset(addr, 0, bytes);
+
+ // Increment the counter
+ _alloced += bytes;
+
+ // Return a pointer to the beginning of the block
+ return addr;
+ bytes += wordsize - bytes % wordsize;
+ }
+
+ void *addr = (static_cast<char *>(_addr)) + _alloced;
+
+ log_msg("%s: Allocating %d bytes at %p\n",
+ __PRETTY_FUNCTION__, bytes, addr);
+
+ // Zero out the block before returning it
+ memset(addr, 0, bytes);
+
+
+ // Increment the counter
+ _alloced += bytes;
+
+ // Return a pointer to the beginning of the block
+ return addr;
+}
+
+// Close the memory segment. This removes it from the system.
+bool
+Shm::closeMem()
+{
+ // Only nuke the shared memory segement if we're the last one.
+#ifdef USE_POSIX_SHM
+#ifdef HAVE_SHM_UNLINK
+ if (strlen(_filespec) != 0) {
+ shm_unlink(_filespec);
+ }
+
+ // flush the shared memory to disk
+ if (_addr > 0) {
+ // detach memory
+ munmap(_addr, _size);
+ }
+#endif
+#ifdef USE_SYSV_SHM
+ shmctl(_shmfd, IPC_RMID, 0);
+#else
+# ifdef __riscos__
+ free(_addr);
+# else
+ CloseHandle(_shmhandle);
+#endif
+#endif
+#endif
+
+ _addr = 0;
+ _alloced = 0;
+ memset(_filespec, 0, MAX_SHM_NAME_SIZE);
+
+ return true;
+}
+
+bool
+Shm::exists()
+{
+ struct stat stats;
+ struct dirent *entry;
+ vector<const char *> dirlist;
+ string realname;
+ DIR *library_dir = NULL;
+
+ // Solaris stores shared memory segments in /var/tmp/.SHMD and
+ // /tmp/.SHMD. Linux stores them in /dev/shm.
+ dirlist.push_back("/dev/shm");
+ dirlist.push_back("/var/tmp/.SHMD");
+ dirlist.push_back("/tmp/.SHMD");
+
+ // Open the directory where the raw POSIX shared memory files are
+ for (unsigned int i=0; i<dirlist.size(); i++)
+ {
+ library_dir = opendir (dirlist[i]);
+ if (library_dir != NULL) {
+ realname = dirlist[i];
+
+ // By convention, the first two entries in each directory
+ // are for . and .. (``dot'' and ``dot dot''), so we
+ // ignore those. The next directory read will get a real
+ // file, if any exists.
+ entry = readdir(library_dir);
+ entry = readdir(library_dir);
+ break;
+ }
+ }
+
+ if (strlen(_filespec)) {
+ realname += _filespec;
+
+ if (stat(realname.c_str(), &stats) == 0) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+} // end of gnash namespace
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: server/shm.h
===================================================================
RCS file: server/shm.h
diff -N server/shm.h
--- server/shm.h 10 Aug 2007 14:06:36 -0000 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,193 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-//
-//
-//
-
-#ifndef __SHM_H__
-#define __SHM_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string>
-
-//#include "impl.h"
-#include "as_object.h" // for inheritance
-
-#include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
-# include <sys/ipc.h>
-# include <sys/shm.h>
-#elif !defined(__riscos__) && !defined(__OS2__)
-# include <windows.h>
-# include <process.h>
-# include <fcntl.h>
-# include <io.h>
-#endif
-
-// Forward declarations
-namespace gnash {
- class fn_call;
-}
-
-namespace gnash {
-
-#ifndef MAP_INHERIT
-const int MAP_INHERIT = 0;
-#endif
-#ifndef MAP_HASSEMAPHORE
-const int MAP_HASSEMAPHORE = 0;
-#endif
-
-const int MAX_SHM_NAME_SIZE = 48;
-
-class Shm {
-public:
-
- DSOEXPORT Shm();
- DSOEXPORT ~Shm();
-
- // Initialize the shared memory segment
- bool attach(char const *filespec, bool nuke);
-
- // Resize the allocated memory segment
- bool resize(int bytes);
- bool resize();
-
- // Allocate a memory from the shared memory segment
- void *brk(int bytes);
-
- // Close the memory segment. This removes it from the system.
- bool closeMem();
-
- Shm *cloneSelf(void);
-
- // Accessors for testing
- char *getAddr() { return _addr; };
- char *getName() { return _filespec; };
- size_t getSize() { return _size; };
- int getAllocated() { return _alloced; };
- bool exists();
-protected:
- char *_addr;
- long _alloced;
- size_t _size;
- char _filespec[MAX_SHM_NAME_SIZE];
-#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
- key_t _shmkey;
-#else
- long _shmkey;
- HANDLE _shmhandle;
-#endif
- int _shmfd;
-};
-
-// Custome memory allocator for the shared memory segment
-template<typename _Tp>
-class ShmAlloc
-{
-private:
- Shm *mmptr;
- Shm mem;
-public:
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
- typedef _Tp* pointer;
- typedef const _Tp* const_pointer;
- typedef _Tp& reference;
- typedef const _Tp& const_reference;
- typedef _Tp value_type;
-
- template<typename _Tp1>
- struct rebind
- { typedef ShmAlloc<_Tp1> other; };
-
- ShmAlloc() throw() { }
-
- ShmAlloc(const ShmAlloc& other) throw()
- : mem(other.mem)
- { }
-
- template<typename _Tp1>
- ShmAlloc(const ShmAlloc<_Tp1>& other) throw()
- : mem(other.mem)
- { }
-
- ~ShmAlloc() throw() { }
-
- pointer
- address(reference __x) const { return &__x; }
-
- const_pointer
- address(const_reference __x) const { return &__x; }
-
- // Allocate memory
- _Tp*
- allocate(size_type n, const void* p = 0) {
- // If the memory manager has no blocks, it hasn't been
- // initialized.
-// if (mminit == false) {
-// mmptr = mem.initMemManager(true);
-// mminit = true;
-// } else {
-// mmptr = mem.initMemManager(false);
-// }
-
- _Tp* ret = 0;
- if (n) {
- ret = (_Tp*)mmptr->brk(n * sizeof(_Tp));
- if (ret == 0)
- throw std::bad_alloc();
- }
- return ret;
- }
-
- // Deallocate memory
- void
- deallocate(pointer __p, size_type __n) {
- //mmptr->free(__p);
- }
-
- void construct(pointer __p, const _Tp& __val) {
- new(__p) _Tp(__val);
- }
- void destroy(pointer __p) { __p->~_Tp(); }
-};
-
-class shm_as_object : public as_object
-{
-public:
- Shm obj;
-};
-
-as_value shm_getname(const fn_call& fn);
-as_value shm_getsize(const fn_call& fn);
-as_value shm_getallocated(const fn_call& fn);
-as_value shm_exists(const fn_call& fn);
-
-} // end of gnash namespace
-
-// end of __SHM_H__
-#endif
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
Index: server/shm.cpp
===================================================================
RCS file: server/shm.cpp
diff -N server/shm.cpp
--- server/shm.cpp 10 Aug 2007 14:06:35 -0000 1.34
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,531 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program 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 General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-//
-//
-//
-
-/* $Id: shm.cpp,v 1.34 2007/08/10 14:06:35 strk Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <fcntl.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
-#include <sys/mman.h>
-#include <sys/shm.h>
-#include <sys/ipc.h>
-#elif !defined(__riscos__) && !defined(__OS2__)
-#include <windows.h>
-#include <process.h>
-#include <io.h>
-#endif
-#include <string>
-#include <vector>
-#include <cerrno>
-
-#include "log.h"
-#include "shm.h"
-#include "fn_call.h"
-
-using namespace std;
-
-namespace gnash {
-
-const int DEFAULT_SHM_SIZE = 10240;
-
-#ifdef darwin
-# ifndef MAP_INHERIT
-# define MAP_INHERIT 0
-#endif
-#ifndef PROT_EXEC
-# define PROT_EXEC
-# endif
-#endif
-
-#ifndef _SC_PAGESIZE
-#define _SC_PAGESIZE 8
-#endif
-
-#define FLAT_ADDR_SPACE 1
-
- Shm::Shm() :_addr(0), _alloced(0), _size(0), _shmkey(0), _shmfd(0)
-{
- memset(_filespec, 0, MAX_SHM_NAME_SIZE);
-}
-
-Shm::~Shm()
-{
-}
-
-/// \brief Initialize the shared memory segment
-///
-/// This creates or attaches to an existing shared memory segment.
-bool
-Shm::attach(char const *filespec, bool nuke)
-{
- bool exists = false;
- long addr;
- // #ifdef FLAT_ADDR_SPACE
- // off_t off;
- // #endif
- Shm *sc;
- string absfilespec;
-
- _size = DEFAULT_SHM_SIZE;
-
-#ifdef darwin
- absfilespec = "/tmp";
-#else
- absfilespec = "/";
-#endif
- absfilespec += filespec;
- filespec = absfilespec.c_str();
- strncpy(_filespec, absfilespec.c_str(), MAX_SHM_NAME_SIZE);
- if (static_cast<int>(absfilespec.size()) > MAX_SHM_NAME_SIZE) {
- log_error("Shared Memory segment name is " SIZET_FMT " bytes too
long!\n",
- absfilespec.size() - MAX_SHM_NAME_SIZE);
- }
-
- // log_msg("%s: Initializing %d bytes of memory for \"%s\"\n",
- // __PRETTY_FUNCTION__, DEFAULT_SHM_SIZE, absfilespec.c_str());
-
- // Adjust the allocated amount of memory to be on a page boundary.
- // We can only do this on POSIX systems, so for braindead win32,
- // don't readjust the size.
-#ifdef HAVE_SYSCONF
- long pageSize = sysconf(_SC_PAGESIZE);
- if (_size % pageSize) {
- _size += pageSize - _size % pageSize;
-// log_msg("Adjusting segment size to %d to be page aligned.\n", _size);
- }
-#endif
-
- errno = 0;
-#ifdef HAVE_SHM_OPEN
- // Create the shared memory segment
- _shmfd = shm_open(filespec, O_RDWR|O_CREAT|O_EXCL|O_TRUNC,
- S_IRUSR|S_IWUSR);
- if (_shmfd < 0 && errno == EEXIST)
-#else
-# ifdef HAVE_SHMGET
- const int shmflg = 0660 | IPC_CREAT | IPC_EXCL;
- _shmkey = 1234567; // FIXME:
- filespec = "1234567";
- _shmfd = shmget(_shmkey, _size, shmflg);
- if (_shmfd < 0 && errno == EEXIST)
-# else
-# ifdef __riscos__
- if (0)
-# else
- _shmhandle = CreateFileMapping ((HANDLE) 0xFFFFFFFF, NULL,
- PAGE_READWRITE, 0,
- _size, filespec);
- if (_shmhandle <= 0)
-# endif
-# endif // end of HAVE_SHMGET
-#endif // end of HAVE_SHM_OPEN
- {
- // If it already exists, then just attach to it.
- exists = true;
- log_msg("Shared Memory segment \"%s\" already exists\n",
- filespec);
-#ifdef HAVE_SHM_OPEN
-// shm_unlink(filespec);
- _shmfd = shm_open(filespec, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-#else
-# ifdef HAVE_SHMGET
- // Get the shared memory id for this segment
- _shmfd = shmget(_shmkey, _size, 0);
-# else
-# ifdef __riscos__
- // do nothing, we never get here.
-# else
- _shmhandle = CreateFileMapping ((HANDLE) 0xFFFFFFFF, NULL,
- PAGE_READWRITE, 0,
- _size, filespec);
-# endif
-#endif
-#endif
- }
-
- // MacOSX returns this when you use O_EXCL for shm_open() instead
- // of EEXIST
-#if defined(HAVE_SHMGET) || defined(HAVE_SHM_OPEN)
- if (_shmfd < 0 && errno == EINVAL)
-#else
-# ifdef __riscos__
- if (0)
-# else
- if (_shmhandle <= 0 && errno == EINVAL)
-#endif
-#endif
- {
- exists = true;
- log_msg(
-#ifdef HAVE_SHM_OPEN
- "WARNING: shm_open() failed, retrying: %s\n",
-#else
-# ifdef HAVE_SHMGET
- "WARNING: shmget() failed, retrying: %s\n",
-# else
- "WARNING: CreateFileMapping() failed, retrying: %s\n",
-# endif
-#endif
- strerror(errno));
-// fd = shm_open(filespec, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
- return false;
- }
-
- // We got the file descriptor, now map it into our process.
-#if defined(HAVE_SHMGET) || defined(HAVE_SHM_OPEN)
- if (_shmfd >= 0)
-#else
-# ifdef __riscos__
- if (1)
-# else
- if (_shmhandle >= 0)
-#endif
-#endif
- {
-#ifdef HAVE_SHM_OPEN
- if (!exists) {
- // Set the size so we can write to new segment
- ftruncate(_shmfd, _size);
- }
- _addr = static_cast<char *>(mmap(0, _size,
- PROT_READ|PROT_WRITE,
-
MAP_SHARED|MAP_INHERIT|MAP_HASSEMAPHORE,
- _shmfd, 0));
- if (_addr == MAP_FAILED) {
- log_msg("WARNING: mmap() failed: %s\n", strerror(errno));
- return false;
- }
-#else // else of HAVE_SHM_OPEN
-# ifdef HAVE_SHMAT
- _addr = (char *)shmat(_shmfd, 0, 0);
- if (_addr <= 0) {
- log_msg("WARNING: shmat() failed: %s\n", strerror(errno));
- return false;
- }
-# else
-# ifdef __riscos__
- _addr = (char *)malloc(_size);
- if (_addr == 0) {
- log_msg("WARNING: malloc() failed\n");
- return false;
- }
-# else
- _addr = (char *)MapViewOfFile (_shmhandle, FILE_MAP_ALL_ACCESS,
- 0, 0, _size);
-# endif
-#endif
-#endif
-// log_msg("The address to the shared memory segment is: %p", _addr);
- if (exists && !nuke) {
- // If there is an existing memory segment that we don't
- // want to trash, we just want to attach to it. We know
- // that a Shm data class has been instantiated in
- // the base of memory, and the first field is the address
- // used for the previous mmap(), so we grab that value,
- // unmap the old address, and map the original address
- // into this process. This is done so that memory
- // allocations between processes all have the same
- // addresses. Otherwise, one can't do globally shared data
- // among processes that requires any dynamic memory
- // allocation. All of this is so our custom memory
- // allocator for STL containers will work.
- addr = *(reinterpret_cast<long *>(_addr));
- if (addr == 0) {
- log_msg("WARNING: No address found in memory segment!\n");
- nuke = true;
- } else {
-#ifdef FLAT_ADDR_SPACE
- log_msg("Adjusting address to 0x%lx\n", addr);
-#ifdef HAVE_SHM_OPEN
- munmap(_addr, _size);
- log_msg("Unmapped address %p\n", _addr);
-#ifdef darwin
- _addr = static_cast<char *>(mmap(reinterpret_cast<char *>(addr),
- _size, PROT_READ,
-
MAP_SHARED|MAP_FIXED|MAP_INHERIT|MAP_HASSEMAPHORE,
- _shmfd, static_cast<off_t>(0)));
-#else
- // off = (off_t)((long)addr - (long)_addr);
- _addr = static_cast<char *>(mmap((char *)addr,
- _size, PROT_READ|PROT_WRITE,
- MAP_FIXED|MAP_SHARED, _shmfd, 0));
-#endif
- if (_addr == MAP_FAILED) {
- log_msg("WARNING: MMAP failed: %s\n", strerror(errno));
- return static_cast<Shm *>(0);
- }
- }
-#else // HAVE_SHM_OPEN
-# ifdef HAVE_SHMAT
- shmdt(_addr);
- _addr = (char *)shmat(_shmfd, (void *)addr, 0);
-# else
-# ifdef __riscos__
- _addr = _addr;
-# else
- CloseHandle(_shmhandle);
- _addr = (char *)MapViewOfFile (_shmhandle, FILE_MAP_ALL_ACCESS,
- 0, 0, _size);
-# endif
-# endif // end of HAVE_SHMAT
- }
-#endif // end of HAVE_SHM_OPEN
-#else // else of FLAT_ADDR_SPACE
-#endif // end of FLAT_ADDR_SPACE
-
- log_msg("Opened Shared Memory segment \"%s\": " SIZET_FMT " bytes at
%p.\n",
- filespec, _size, _addr);
- }
-
- if (nuke) {
- // log_msg("Zeroing %d bytes at %p.\n", _size, _addr);
- // Nuke all the segment, so we don't have any problems
- // with leftover data.
- memset(_addr, 0, _size);
- sc = cloneSelf();
- } else {
- sc = reinterpret_cast<Shm *>(_addr);
- }
- } else {
- log_msg("ERROR: Couldn't open the Shared Memory segment \"%s\"! %s\n",
- filespec, strerror(errno));
- return false;
- }
-
-#ifdef HAVE_SHM_OPEN
-// don't close it on an error
- if (_shmfd) {
- ::close(_shmfd);
- }
-#endif
-
- return true;
-}
-
-/// \brief Copy the current data for the shared memory segment to the
-/// head of the segment.
-Shm *
-Shm::cloneSelf(void)
-{
-
- if (_addr > 0) {
-// log_msg("Cloning ShmControl, %d bytes to %p\n",
-// sizeof(Shm), _addr);
- // set the allocated bytes before we copy so the value is
- // correct in both instantiations of this object.
- _alloced = sizeof(Shm);
- memcpy(_addr, this, sizeof(Shm));
- return reinterpret_cast<Shm *>(_addr);
- }
-
- log_msg("WARNING: Can't clone Self, address 0x0\n");
-
- return static_cast<Shm *>(0);
-}
-
-// Resize the allocated memory segment
-bool
-Shm::resize()
-{
- // Increase the size by 10 %
- return resize(DEFAULT_SHM_SIZE + (DEFAULT_SHM_SIZE/10));
-}
-
-bool
-Shm::resize(int /* bytes */)
-
-{
-# ifdef HAVE_MREMAP
- _addr = mremap(_shmAddr, _shmSize, _shmSize + bytes, MREMAP_MAYMOVE);
- if (_addr != 0) {
- return true;
- }
-#else
- // FIXME: alloc a whole new segment, and copy this one
- // into it. Yeuch...
-#endif
- return false;
-}
-
-// Allocate a memory from the shared memory segment
-void *
-Shm::brk(int bytes)
-{
- int wordsize = sizeof(long);
-
- // Adjust the allocated amount of memory to be on a word boundary.
- if (bytes % wordsize) {
- int wordsize = sizeof(long);
-
- // Adjust the allocated amount of memory to be on a word boundary.
- if (bytes % wordsize) {
- bytes += wordsize - bytes % wordsize;
- }
-
- void *addr = (static_cast<char *>(_addr)) + _alloced;
-
- log_msg("%s: Allocating %d bytes at %p\n",
- __PRETTY_FUNCTION__, bytes, addr);
- // Zero out the block before returning it
- memset(addr, 0, bytes);
-
- // Increment the counter
- _alloced += bytes;
-
- // Return a pointer to the beginning of the block
- return addr;
- bytes += wordsize - bytes % wordsize;
- }
-
- void *addr = (static_cast<char *>(_addr)) + _alloced;
-
- log_msg("%s: Allocating %d bytes at %p\n",
- __PRETTY_FUNCTION__, bytes, addr);
-
- // Zero out the block before returning it
- memset(addr, 0, bytes);
-
-
- // Increment the counter
- _alloced += bytes;
-
- // Return a pointer to the beginning of the block
- return addr;
-}
-
-// Close the memory segment. This removes it from the system.
-bool
-Shm::closeMem()
-{
- // Only nuke the shared memory segement if we're the last one.
-#ifdef HAVE_SHM_UNLINK
- if (strlen(_filespec) != 0) {
- shm_unlink(_filespec);
- }
-
- // flush the shared memory to disk
- if (_addr > 0) {
- // detach memory
- munmap(_addr, _size);
- }
-#else
-#ifdef HAVE_SHMGET
- shmctl(_shmfd, IPC_RMID, 0);
-#else
-# ifdef __riscos__
- free(_addr);
-# else
- CloseHandle(_shmhandle);
-#endif
-#endif
-#endif
-
- _addr = 0;
- _alloced = 0;
- memset(_filespec, 0, MAX_SHM_NAME_SIZE);
-
- return true;
-}
-
-bool
-Shm::exists()
-{
- struct stat stats;
- struct dirent *entry;
- vector<const char *> dirlist;
- string realname;
- DIR *library_dir = NULL;
-
- // Solaris stores shared memory segments in /var/tmp/.SHMD and
- // /tmp/.SHMD. Linux stores them in /dev/shm.
- dirlist.push_back("/dev/shm");
- dirlist.push_back("/var/tmp/.SHMD");
- dirlist.push_back("/tmp/.SHMD");
-
- // Open the directory where the raw POSIX shared memory files are
- for (unsigned int i=0; i<dirlist.size(); i++)
- {
- library_dir = opendir (dirlist[i]);
- if (library_dir != NULL) {
- realname = dirlist[i];
-
- // By convention, the first two entries in each directory
- // are for . and .. (``dot'' and ``dot dot''), so we
- // ignore those. The next directory read will get a real
- // file, if any exists.
- entry = readdir(library_dir);
- entry = readdir(library_dir);
- break;
- }
- }
-
- if (strlen(_filespec)) {
- realname += _filespec;
-
- if (stat(realname.c_str(), &stats) == 0) {
- return true;
- }
- }
-
- return false;
-}
-
-// These are the callbacks used to define custom methods for our AS
-// classes. This way we can examine the private data after calling a
-// method to see if it worked correctly.
-as_value shm_getname(const fn_call& fn)
-{
- boost::intrusive_ptr<shm_as_object> ptr =
ensureType<shm_as_object>(fn.this_ptr);
- assert(ptr);
- return as_value(ptr->obj.getName());
-}
-as_value shm_getsize(const fn_call& fn)
-{
- boost::intrusive_ptr<shm_as_object> ptr =
ensureType<shm_as_object>(fn.this_ptr);
- assert(ptr);
- return as_value(ptr->obj.getSize());
-}
-as_value shm_getallocated(const fn_call& fn)
-{
- boost::intrusive_ptr<shm_as_object> ptr =
ensureType<shm_as_object>(fn.this_ptr);
- assert(ptr);
- return as_value(ptr->obj.getAllocated());
-}
-as_value shm_exists(const fn_call& fn)
-{
- boost::intrusive_ptr<shm_as_object> ptr =
ensureType<shm_as_object>(fn.this_ptr);
- assert(ptr);
- return as_value(ptr->obj.exists());
-}
-
-} // end of gnash namespace
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash server/Makefile.am libbase/Makefile.am Ch...,
Rob Savoye <=