~ubuntu-branches/ubuntu/lucid/erlang/lucid

« back to all changes in this revision

Viewing changes to erts/emulator/beam/erl_db_util.h

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-11-06 18:54:42 UTC
  • mfrom: (3.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091106185442-bqxb11qghumvmvx2
Tags: 1:13.b.2.1-dfsg-1ubuntu1
* Merge with Debian testing; remaining Ubuntu changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to. (LP #438365)
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
208
208
    erts_smp_rwmtx_t rwlock;  /* rw lock on table */
209
209
    erts_smp_mtx_t fixlock;   /* Protects fixations,megasec,sec,microsec */
210
210
    int is_thread_safe;       /* No fine locking inside table needed */
211
 
    Uint32 type;              /* hash or tree, private or not; *read only* after creation */
 
211
    Uint32 type;              /* table type, *read only* after creation */
212
212
#endif
213
213
    Eterm owner;              /* Pid of the creator */
214
214
    Eterm heir;               /* Pid of the heir */
241
241
#define DB_ORDERED_SET   (1 << 9)
242
242
#define DB_DELETE        (1 << 10) /* table is being deleted */
243
243
 
244
 
#define ERTS_ETS_TABLE_TYPES (DB_BAG|DB_SET|DB_DUPLICATE_BAG|DB_ORDERED_SET|DB_PRIVATE|DB_FINE_LOCKED)
 
244
#define ERTS_ETS_TABLE_TYPES (DB_BAG|DB_SET|DB_DUPLICATE_BAG|DB_ORDERED_SET|DB_FINE_LOCKED)
245
245
 
246
246
#define IS_HASH_TABLE(Status) (!!((Status) & \
247
247
                                  (DB_BAG | DB_SET | DB_DUPLICATE_BAG)))