search for: ghashtabl

I'm currently working on gobject bindings for libguestfs. I haven't got as far as compiling anything yet, but I've attached the C header for initial review. Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490 -------------- next part -------------- An embedded and

...ng types return the value from libguestfs unchanged: RInt RInt64 RBool RConstString (transfer none): gobject doesn't manage returned memory RConstOptString (transfer none). Methods don't return an error (no GError**) RString RStringList RHashtable is converted to a GHashTable. The keys and values from libguestfs are inserted directly into the GHashTable without copying. The top level array returned by libguestfs is freed. RStruct is converted to GObject boxed type for the target struct. It returns a copy of the struct, which is copied field by field. Memory for th...

...roperties */ + gsize memory_until_gc;/* amount of memory allocations that trigger a GC */ + /* bookkeeping for GC */ - gsize memory; /* memory currently in use */ + gsize memory; /* total memory currently in use */ + gsize memory_since_gc;/* memory allocated since last GC run */ GHashTable * strings; /* string=>memory mapping the context manages */ GHashTable * objects; /* all objects the context manages */ @@ -108,6 +112,7 @@ void swfdec_as_object_mark (SwfdecAsOb void swfdec_as_value_mark (SwfdecAsValue * value); void swfdec_as_string_mark (const char * string);...

...fdec_as_object.h b/libswfdec/swfdec_as_object.h index a61bc4b..425fa13 100644 --- a/libswfdec/swfdec_as_object.h +++ b/libswfdec/swfdec_as_object.h @@ -61,6 +61,7 @@ struct _SwfdecAsObject { /*< private >*/ SwfdecAsObject * prototype; /* prototype object (referred to as __proto__) */ GHashTable * properties; /* string->SwfdecAsVariable mapping or NULL when not in GC */ + GHashTable * watches; /* string->WatchData mapping or NULL when not watching anything */ guint8 flags; /* GC flags */ gsize size; /* size reserved in GC */ }; diff-tree b971a7a434b0b1535eff0ced3eba03...

.....f5a57d6 100644 --- a/libswfdec/swfdec_root_movie.h +++ b/libswfdec/swfdec_root_movie.h @@ -45,6 +45,7 @@ struct _SwfdecRootMovie guint unnamed_count; /* variable used for naming unnamed movies */ guint root_actions_performed; /* root actions been performed in all frames < this*/ + GHashTable * exports; /* string->SwfdecCharacter mapping of exported characters */ }; struct _SwfdecRootMovieClass @@ -61,5 +62,8 @@ void swfdec_root_movie_load (SwfdecRo void swfdec_root_movie_perform_root_actions (SwfdecRootMovie * root, guint frame); +gpointer swfdec_root_movie_g...

.....f1ae02b 100644 --- a/libswfdec/swfdec_root_movie.h +++ b/libswfdec/swfdec_root_movie.h @@ -45,7 +45,6 @@ struct _SwfdecRootMovie guint unnamed_count; /* variable used for naming unnamed movies */ guint root_actions_performed; /* root actions been performed in all frames < this*/ - GHashTable * character_data; /* custom data per character to be set by the movie using them */ }; struct _SwfdecRootMovieClass @@ -59,13 +58,6 @@ void swfdec_root_movie_load (SwfdecRo const char * url, const char * target); -void swfdec_root_movie_set_character_data (SwfdecRoot...

This is the first iteration of the GObject bindings. I have 'kicked the tyres' on these, meaning I have ensured that a bunch of basic manual tests work as expected. I'm in the process of adding more comprehensive tests. Here's an example simple javascript program which uses these bindings: === const Guestfs = imports.gi.Guestfs; print('Starting'); var g = new

...PE_CHECK_CLASS_CAST ((klass), SWFDEC_TYPE_DEBUG_MOVIES, SwfdecDebugMoviesClass)) - -struct _SwfdecDebugMovies -{ - GObject object; - - SwfdecPlayer * player; /* the video we play */ - GNode * root; /* the root node containing all the movies */ - int stamp; /* to validate tree iters */ - GHashTable * nodes; /* movies => node fast lookup table */ -}; - -struct _SwfdecDebugMoviesClass -{ - GObjectClass object_class; -}; - -GType swfdec_debug_movies_get_type (void); - -SwfdecDebugMovies * - swfdec_debug_movies_new (SwfdecPlayer * player); - - -G_END_DECLS -#endif diff --git a/vivif...

...r; /* the loader providing data for the decoder */ - SwfdecDecoder * decoder; /* decoder that decoded all the stuff used by us */ + SwfdecDecoder * decoder; /* decoder in use or NULL if not yet created (only happens after loadMovie()) */ char * variables; /* extra variables to be set */ GHashTable * exports; /* string->SwfdecCharacter mapping of exported characters */ commit 8283af4ebc5efe8fd8d1072c37e604e988a50e2b Merge: eedca0f... b4c20d7... Author: Benjamin Otte <otte at gnome.org> Date: Fri Oct 19 14:41:13 2007 +0200 Merge branch 'master' of ssh://company at git...

..., [SWFDEC_AS_ACTION_MB_STRING_LENGTH] = { "MBStringLength", NULL }, diff --git a/libswfdec/swfdec_as_object.h b/libswfdec/swfdec_as_object.h index 1877817..4fcddb4 100644 --- a/libswfdec/swfdec_as_object.h +++ b/libswfdec/swfdec_as_object.h @@ -65,6 +65,7 @@ struct _SwfdecAsObject { GHashTable * watches; /* string->WatchData mapping or NULL when not watching anything */ guint8 flags; /* GC flags */ gsize size; /* size reserved in GC */ + GSList * interfaces; /* list of interfaces this object implements */ }; struct _SwfdecAsObjectClass {

...fdec_sprite.h b/libswfdec/swfdec_sprite.h index d0e3bb8..f2e7be5 100644 --- a/libswfdec/swfdec_sprite.h +++ b/libswfdec/swfdec_sprite.h @@ -76,6 +76,7 @@ struct _SwfdecSprite /* parse state */ unsigned int parse_frame; /* frame we're currently parsing. == n_frames if done parsing */ + GHashTable * live_content; /* depth->SwfdecSpriteContent for every content in parse_frame */ }; struct _SwfdecSpriteClass diff-tree 99028e122d8c91ad4d6f56ef3d38205a4347b374 (from 324a772186b03ab45ba730faa742ff35041d6a2a) Author: Benjamin Otte <otte@gnome.org> Date: Tue Mar 6 17:21:10 2007 +01...

...* loader; /* the loader providing data for the decoder */ - SwfdecDecoder * decoder; /* decoder in use or NULL if not yet created (only happens after loadMovie()) */ + SwfdecDecoder * decoder; /* decoder in use or NULL if broken file */ char * variables; /* extra variables to be set */ GHashTable * exports; /* string->SwfdecCharacter mapping of exported characters */

...+ char * name; + SwfdecCharacter * character; +}; #define SWFDEC_TYPE_SWF_DECODER (swfdec_swf_decoder_get_type()) #define SWFDEC_IS_SWF_DECODER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SWFDEC_TYPE_SWF_DECODER)) @@ -62,6 +73,7 @@ struct _SwfdecSwfDecoder GHashTable *characters; /* list of all objects with an id (called characters) */ SwfdecSprite *main_sprite; SwfdecSprite *parse_sprite; + GArray **root_actions; /* actions to be executed by the root sprite */ gboolean protection; /* TRUE is this file is protected and may not be edited */ c...

...ble for creating this instance */ + guint parse_frame; /* next frame to parse */ + + SwfdecLoader * loader; /* the loader providing data for the decoder */ + SwfdecDecoder * decoder; /* decoder that decoded all the stuff used by us */ + char * variables; /* extra variables to be set */ + + GHashTable * exports; /* string->SwfdecCharacter mapping of exported characters */ + GHashTable * export_names; /* SwfdecCharacter->string mapping of exported characters */ +}; + +struct _SwfdecResourceClass +{ + SwfdecFlashSecurityClass flash_security_class; +}; + +GType swfdec_resource_get_type...

...nction is then supposed + * to return the new name of the variable or %NULL if the variable should be + * removed. This is an internal function for array operations. + **/ void swfdec_as_object_foreach_rename (SwfdecAsObject *object, SwfdecAsVariableForeachRename func, gpointer data) { - GHashTable *properties_new = g_hash_table_new (g_direct_hash, g_direct_equal); + GHashTable *properties_new; ForeachRenameData fdata = { object, properties_new, func, data }; + g_return_if_fail (SWFDEC_IS_AS_OBJECT (object)); + g_return_if_fail (func != NULL); + + properties_new = g_hash_table_new (...

...h +++ b/libswfdec/swfdec_swf_instance.h @@ -43,6 +43,7 @@ struct _SwfdecSwfInstance SwfdecLoader * loader; /* the loader providing data for the decoder */ SwfdecDecoder * decoder; /* decoder that decoded all the stuff used by us */ + char * variables; /* extra variables to be set */ GHashTable * exports; /* string->SwfdecCharacter mapping of exported characters */ GHashTable * export_names; /* SwfdecCharacter->string mapping of exported characters */ @@ -57,7 +58,8 @@ GType swfdec_swf_instance_get_type ( SwfdecSwfInstance * swfdec_swf_instance_new (SwfdecSpriteMov...

...VIES_COLUMN_TYPE, /* add more */ SWFDEC_DEBUG_MOVIES_N_COLUMNS @@ -47,6 +47,9 @@ struct _SwfdecDebugMovies GObject object; SwfdecPlayer * player; /* the video we play */ + GNode * root; /* the root node containing all the movies */ + int stamp; /* to validate tree iters */ + GHashTable * nodes; /* movies => node fast lookup table */ }; struct _SwfdecDebugMoviesClass diff-tree 55ac6dbcb2e4f23ed2be981e19ab4a4b9cd99069 (from 3b8f78e8ef27636331d6c80f6cb0fcdbbb3fd3e2) Author: Benjamin Otte <otte at gnome.org> Date: Tue Aug 7 15:06:04 2007 +0200 make depth a movi...

...- char * name; - SwfdecCharacter * character; -}; #define SWFDEC_TYPE_SWF_DECODER (swfdec_swf_decoder_get_type()) #define SWFDEC_IS_SWF_DECODER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SWFDEC_TYPE_SWF_DECODER)) @@ -79,7 +62,6 @@ struct _SwfdecSwfDecoder GHashTable * characters; /* list of all objects with an id (called characters) */ SwfdecSprite * main_sprite; /* the root sprite */ SwfdecSprite * parse_sprite; /* the sprite that parsed at the moment */ - GArray ** root_actions; /* actions to be executed by the root sprite */ GHashTable * s...

This reverts commit 3f6ca541c7b24d4c86688a509582cb41a7e0078c. The original commit was reverted prematurely. --- generator/generator_actions.ml | 10 +++++----- generator/generator_checks.ml | 5 +++++ generator/generator_types.ml | 3 +++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index

...been called */ + SWFDEC_RESOURCE_COMPLETE, /* onLoadComplete has been called */ + SWFDEC_RESOURCE_DONE /* onLoadInit has been called, clip_loader is unset */ +} SwfdecResourceState; + struct _SwfdecResource { SwfdecFlashSecurity flash_security; @@ -50,6 +58,7 @@ struct _SwfdecResource GHashTable * export_names; /* SwfdecCharacter->string mapping of exported characters */ /* only used while loading */ + SwfdecResourceState state; /* state we're in (for determining callbacks */ char * target; /* target path we use for signalling */ SwfdecMovieClipLoader *clip_loader;...