Commit 7f2c9f9c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove vlc_threadobj (did not work properly anymore)

parent 5bd06c4b
......@@ -45,7 +45,6 @@ void system_End ( libvlc_int_t * );
*/
int vlc_threads_init( void );
void vlc_threads_end( void );
vlc_object_t *vlc_threadobj (void);
/* Hopefully, no need to export this. There is a new thread API instead. */
void vlc_thread_cancel (vlc_object_t *);
......
......@@ -594,17 +594,9 @@ void * vlc_object_get( int i_id )
libvlc_global_data_t *p_libvlc_global = vlc_global();
vlc_object_t *obj = NULL;
#ifndef NDEBUG
vlc_object_t *caller = vlc_threadobj ();
if (caller)
msg_Dbg (caller, "uses deprecated vlc_object_get(%d)", i_id);
else
{
int canc = vlc_savecancel ();
fprintf (stderr, "main thread uses deprecated vlc_object_get(%d)\n",
i_id);
vlc_restorecancel (canc);
}
int canc = vlc_savecancel ();
fprintf (stderr, "Use of deprecated vlc_object_get(%d)\n", i_id);
vlc_restorecancel (canc);
#endif
vlc_mutex_lock( &structure_lock );
......@@ -620,10 +612,7 @@ void * vlc_object_get( int i_id )
}
obj = NULL;
#ifndef NDEBUG
if (caller)
msg_Warn (caller, "wants non-existing object %d", i_id);
else
fprintf (stderr, "main thread wants non-existing object %d\n", i_id);
fprintf (stderr, "Object %d does not exist\n", i_id);
#endif
out:
vlc_mutex_unlock( &structure_lock );
......
......@@ -66,18 +66,6 @@ libvlc_global_data_t *vlc_global( void )
return p_root;
}
#ifndef NDEBUG
/**
* Object running the current thread
*/
static vlc_threadvar_t thread_object_key;
vlc_object_t *vlc_threadobj (void)
{
return vlc_threadvar_get (&thread_object_key);
}
#endif
vlc_threadvar_t msg_context_global_key;
#if defined(LIBVLC_USE_PTHREAD)
......@@ -190,9 +178,6 @@ int vlc_threads_init( void )
}
/* We should be safe now. Do all the initialization stuff we want. */
#ifndef NDEBUG
vlc_threadvar_create( &thread_object_key, NULL );
#endif
vlc_threadvar_create( &msg_context_global_key, msg_StackDestroy );
#ifndef LIBVLC_USE_PTHREAD_CANCEL
vlc_threadvar_create( &cancel_key, free );
......@@ -230,9 +215,6 @@ void vlc_threads_end( void )
vlc_threadvar_delete( &cancel_key );
#endif
vlc_threadvar_delete( &msg_context_global_key );
#ifndef NDEBUG
vlc_threadvar_delete( &thread_object_key );
#endif
}
i_initializations--;
......@@ -661,9 +643,6 @@ static void *thread_entry (void *data)
void *(*func) (vlc_object_t *) = ((struct vlc_thread_boot *)data)->entry;
free (data);
#ifndef NDEBUG
vlc_threadvar_set (&thread_object_key, obj);
#endif
msg_Dbg (obj, "thread started");
func (obj);
msg_Dbg (obj, "thread ended");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment