Re: [PHP-CVS] cvs: php4 / NEWS /ext/mysql/libmysql acinclude.m4 bmove.ccharset.c config-win.h dbug.h default.c errors.c fix_copyright global.hlibmysql.c m_string.h mf_dirname.c mf_format.c mf_pack.c mf_path.cmy_alloc.c my_create.c my_fopen.c my_i

2001-01-24 Thread Thimble Smith

On Tue, Jan 23, 2001 at 08:59:42PM +0100, Sebastian Bergmann wrote:
   I can't link the latest CVS of PHP on Win32:
 
 libmysql.lib(my_thr_init.obj) : error LNK2001: Nichtaufgeloestes externes
 Symbol _win_pthread_init
 libmysql.lib(my_compress.obj) : error LNK2001: Nichtaufgeloestes externes
 Symbol _compress
 libmysql.lib(my_compress.obj) : error LNK2001: Nichtaufgeloestes externes
 Symbol _uncompress
 ..\Release_TS_inline\php4ts.dll : fatal error LNK1120: 3 unaufgeloeste
 externe Verweise

OK.  That's what I asked about in my first mail to the list (is
HAVE_COMPRESS okay on Windows?).  I guess it's not.  I'll change
config-win.h so this doesn't happen anymore.

Tim

-- 
   __  ___ ___   __
  /  |/  /_ __/ __/ __ \/ /Tim Smith [EMAIL PROTECTED]
 / /|_/ / // /\ \/ /_/ / /__   MySQL AB, Development Team
/_/  /_/\_, /___/\___\_\___/   Helsinki, Finland (for a few weeks)
   ___/   www.mysql.com

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-CVS] cvs: php4 /ext/mysql/libmysql config-win.h update_sources

2001-01-24 Thread Thimble Smith

On Wed, Jan 24, 2001 at 07:33:07PM +0100, Sebastian Bergmann wrote:
 libmysql.lib(my_thr_init.obj) : error LNK2001: 
 Not resolved external symbol _win_pthread_init

OK.  Can you add the attached file to the libmysql directory
and see if it fixes the problem?  If so, I'll add it to CVS.

Thanks.

Tim

-- 
   __  ___ ___   __
  /  |/  /_ __/ __/ __ \/ /Tim Smith [EMAIL PROTECTED]
 / /|_/ / // /\ \/ /_/ / /__   MySQL AB, Development Team
/_/  /_/\_, /___/\___\_\___/   Helsinki, Finland (for a few weeks)
   ___/   www.mysql.com


/* Copyright Abandoned.  Public domain, no warranty, etc. */

/*
** Simulation of posix threads calls for WIN95 and NT
*/

/* SAFE_MUTEX will not work until the thread structure is up to date */
#undef SAFE_MUTEX

#include "mysys_priv.h"
#if defined(THREAD)  defined(__WIN__)
#include m_string.h
#undef getpid
#include process.h

static pthread_mutex_t THR_LOCK_thread;

struct pthread_map
{
  HANDLE pthreadself;
  pthread_handler func;
  void *param;
};

void win_pthread_init(void)
{
  pthread_mutex_init(THR_LOCK_thread,NULL);
}

/*
** We have tried to use '_beginthreadex' instead of '_beginthread' here
** but in this case the program leaks about 512 characters for each
** created thread !
** As we want to save the created thread handler for other threads to
** use and to be returned by pthread_self() (instead of the Win32 pseudo
** handler), we have to go trough pthread_start() to catch the returned handler
** in the new thread.
*/

static pthread_handler_decl(pthread_start,param)
{
  pthread_handler func=((struct pthread_map *) param)-func;
  void *func_param=((struct pthread_map *) param)-param;
  my_thread_init(); /* Will always succeed in windows */
  pthread_mutex_lock(THR_LOCK_thread);   /* Wait for beginthread to return */
  win_pthread_self=((struct pthread_map *) param)-pthreadself;
  pthread_mutex_unlock(THR_LOCK_thread);
  free((char*) param);/* Free param from create */
  pthread_exit((void*) (*func)(func_param));
  return 0;   /* Safety */
}


int pthread_create(pthread_t *thread_id, pthread_attr_t *attr,
   pthread_handler func, void *param)
{
  HANDLE hThread;
  struct pthread_map *map;
  DBUG_ENTER("pthread_create");

  if (!(map=malloc(sizeof(*map
DBUG_RETURN(-1);
  map-func=func;
  map-param=param;
  pthread_mutex_lock(THR_LOCK_thread);
#ifdef __BORLANDC__
  hThread=(HANDLE)_beginthread((void(_USERENTRY *)(void *)) pthread_start,
   attr-dwStackSize ? attr-dwStackSize :
   65535, (void*) map);
#else
  hThread=(HANDLE)_beginthread((void( __cdecl *)(void *)) pthread_start,
   attr-dwStackSize ? attr-dwStackSize :
   65535, (void*) map);
#endif
  DBUG_PRINT("info", ("hThread=%lu",(long) hThread));
  *thread_id=map-pthreadself=hThread;
  pthread_mutex_unlock(THR_LOCK_thread);

  if (hThread == (HANDLE) -1)
  {
int error=errno;
DBUG_PRINT("error",
   ("Can't create thread to handle request (error %d)",error));
DBUG_RETURN(error ? error : -1);
  }
  VOID(SetThreadPriority(hThread, attr-priority)) ;
  DBUG_RETURN(0);
}


void pthread_exit(void *a)
{
  _endthread();
}

/* This is neaded to get the macro pthread_setspecific to work */

int win_pthread_setspecific(void *a,void *b,uint length)
{
  memcpy(a,b,length);
  return 0;
}

#endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]