From b434a3ab242dde66e23a72122474854f51a61eff Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 8 Aug 2012 02:20:05 +0200
Subject: Prepare for use of ptab functionality also for ports

---
 erts/emulator/beam/beam_bp.c            |  10 +-
 erts/emulator/beam/beam_emu.c           |  20 +-
 erts/emulator/beam/bif.c                |  96 +++---
 erts/emulator/beam/break.c              |  10 +-
 erts/emulator/beam/copy.c               |   4 +-
 erts/emulator/beam/dist.c               |  64 ++--
 erts/emulator/beam/dist.h               |   2 +-
 erts/emulator/beam/erl_async.c          |   2 +-
 erts/emulator/beam/erl_bif_ddll.c       |   4 +-
 erts/emulator/beam/erl_bif_info.c       |  30 +-
 erts/emulator/beam/erl_bif_port.c       |  18 +-
 erts/emulator/beam/erl_bif_timer.c      |   4 +-
 erts/emulator/beam/erl_bif_trace.c      |  14 +-
 erts/emulator/beam/erl_db.c             |  69 +++--
 erts/emulator/beam/erl_db_util.c        |   2 +-
 erts/emulator/beam/erl_db_util.h        |   4 +-
 erts/emulator/beam/erl_debug.c          |  28 +-
 erts/emulator/beam/erl_gc.c             |   2 +-
 erts/emulator/beam/erl_message.c        |  10 +-
 erts/emulator/beam/erl_monitors.c       |   6 +-
 erts/emulator/beam/erl_monitors.h       |   2 -
 erts/emulator/beam/erl_nif.c            |  12 +-
 erts/emulator/beam/erl_node_tables.c    |  33 +-
 erts/emulator/beam/erl_port.h           | 503 +++++++++++++++++++++++++++++++
 erts/emulator/beam/erl_port_task.c      |  31 +-
 erts/emulator/beam/erl_process.c        | 131 ++++----
 erts/emulator/beam/erl_process.h        |   5 -
 erts/emulator/beam/erl_process_dict.c   |   6 +-
 erts/emulator/beam/erl_process_dump.c   |   8 +-
 erts/emulator/beam/erl_ptab.h           |  12 +-
 erts/emulator/beam/erl_trace.c          | 134 ++++-----
 erts/emulator/beam/global.h             | 514 +-------------------------------
 erts/emulator/beam/io.c                 | 163 +++++-----
 erts/emulator/beam/register.c           |  23 +-
 erts/emulator/hipe/hipe_debug.c         |  13 +-
 erts/emulator/hipe/hipe_mkliterals.c    |   2 +-
 erts/emulator/sys/common/erl_check_io.c |  10 +-
 erts/emulator/sys/unix/sys.c            |   6 +-
 38 files changed, 1015 insertions(+), 992 deletions(-)
 create mode 100644 erts/emulator/beam/erl_port.h

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index a6e00f87e0..34628b4708 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -658,7 +658,7 @@ void erts_schedule_time_break(Process *p, Uint schedule) {
 	    if (pbdt) {
 		get_sys_now(&ms,&s,&us);
 		bp_time_diff(&sitem, pbt, ms, s, us);
-		sitem.pid   = p->id;
+		sitem.pid   = p->common.id;
 		sitem.count = 0;
 
 		h = &(pbdt->hash[bp_sched2ix_proc(p)]);
@@ -735,7 +735,7 @@ void erts_trace_time_break(Process *p, BeamInstr *pc, BpDataTime *bdt, Uint type
 		ASSERT(pbt->pc);
 		/* add time to previous code */
 		bp_time_diff(&sitem, pbt, ms, s, us);
-		sitem.pid   = p->id;
+		sitem.pid   = p->common.id;
 		sitem.count = 0;
 
 		/* previous breakpoint */
@@ -762,7 +762,7 @@ void erts_trace_time_break(Process *p, BeamInstr *pc, BpDataTime *bdt, Uint type
 		(void *) ERTS_PROC_SET_CALL_TIME(p, ERTS_PROC_LOCK_MAIN, pbt);
 	    }
 	    /* add count to this code */
-	    sitem.pid     = p->id;
+	    sitem.pid     = p->common.id;
 	    sitem.count   = 1;
 	    sitem.s_time  = 0;
 	    sitem.us_time = 0;
@@ -792,7 +792,7 @@ void erts_trace_time_break(Process *p, BeamInstr *pc, BpDataTime *bdt, Uint type
 	     * lookup bdt from code
 	     * timestamp = t1
 	     * get ts0 from pbt
-	     * get item from bdt->hash[bp_hash(p->id)]
+	     * get item from bdt->hash[bp_hash(p->common.id)]
 	     * ack diff (t1, t0) to item
 	     */
 
@@ -803,7 +803,7 @@ void erts_trace_time_break(Process *p, BeamInstr *pc, BpDataTime *bdt, Uint type
 		ASSERT(pbt->pc);
 
 		bp_time_diff(&sitem, pbt, ms, s, us);
-		sitem.pid   = p->id;
+		sitem.pid   = p->common.id;
 		sitem.count = 0;
 
 		/* previous breakpoint */
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index fadbbfc0e3..3fb2fbd01c 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -569,7 +569,7 @@ extern int count_instructions;
 #  define Dispatchfun() DispatchMacroFun()
 #endif
 
-#define Self(R) R = c_p->id
+#define Self(R) R = c_p->common.id
 #define Node(R) R = erts_this_node->sysname
 
 #define Arg(N)       I[(N)+1]
@@ -1138,8 +1138,8 @@ dtrace_drvport_str(ErlDrvPort drvport, char *port_buf)
     Port *port = erts_drvport2port(drvport);
 
     erts_snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
-                  port_channel_no(port->id),
-                  port_number(port->id));
+                  port_channel_no(port->common.id),
+                  port_number(port->common.id));
 }
 #endif
 /*
@@ -1264,7 +1264,7 @@ void process_main(void)
     c_p = schedule(c_p, reds_used);
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
 #ifdef DEBUG
-    pid = c_p->id; /* Save for debugging purpouses */
+    pid = c_p->common.id; /* Save for debugging purpouses */
 #endif
     ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
     PROCESS_MAIN_CHK_LOCKS(c_p);
@@ -1935,14 +1935,14 @@ void process_main(void)
 		     erts_fprintf(stderr,
 				  "Dtrace -> (%T) stop spreading "
 				  "tag %T with message %T\r\n",
-				  c_p->id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
+				  c_p->common.id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
 #endif
 	     } else {
 #ifdef DTRACE_TAG_HARDDEBUG
 		 erts_fprintf(stderr,
 			      "Dtrace -> (%T) kill tag %T with "
 			      "message %T\r\n",
-			      c_p->id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
+			      c_p->common.id,DT_UTAG(c_p),ERL_MESSAGE_TERM(msgp));
 #endif
 		 DT_UTAG(c_p) = NIL;
 		 SEQ_TRACE_TOKEN(c_p) = NIL;
@@ -1967,7 +1967,7 @@ void process_main(void)
 	     erts_fprintf(stderr,
 			  "Dtrace -> (%T) receive tag (%T) "
 			  "with message %T\r\n",
-			  c_p->id, DT_UTAG(c_p), ERL_MESSAGE_TERM(msgp));
+			  c_p->common.id, DT_UTAG(c_p), ERL_MESSAGE_TERM(msgp));
 #endif
 	 } else {
 #endif
@@ -1983,7 +1983,7 @@ void process_main(void)
 	     }
 	     msg = ERL_MESSAGE_TERM(msgp);
 	     seq_trace_output(SEQ_TRACE_TOKEN(c_p), msg, SEQ_TRACE_RECEIVE, 
-			      c_p->id, c_p);
+			      c_p->common.id, c_p);
 #ifdef USE_VM_PROBES
 	 }
 #endif
@@ -5551,7 +5551,7 @@ terminate_proc(Process* c_p, Eterm Value)
     /* EXF_LOG is a primary exception flag */
     if (c_p->freason & EXF_LOG) {
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	erts_dsprintf(dsbufp, "Error in process %T ", c_p->id);
+	erts_dsprintf(dsbufp, "Error in process %T ", c_p->common.id);
 	if (erts_is_alive)
 	    erts_dsprintf(dsbufp, "on node %T ", erts_this_node->sysname);
 	erts_dsprintf(dsbufp,"with exit value: %0.*T\n", display_items, Value);
@@ -6539,7 +6539,7 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
 #endif
     funp->fe = fe;
     funp->num_free = num_free;
-    funp->creator = p->id;
+    funp->creator = p->common.id;
 #ifdef HIPE
     funp->native_address = fe->native_address;
 #endif
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 10dcba565b..84513c1b0e 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -102,8 +102,8 @@ static int insert_internal_link(Process* p, Eterm rpid)
     }
 
     if (p != rp) {
-	erts_add_link(&(p->nlinks), LINK_PID, rp->id);
-	erts_add_link(&(rp->nlinks), LINK_PID, p->id);
+	erts_add_link(&ERTS_P_LINKS(p), LINK_PID, rp->common.id);
+	erts_add_link(&ERTS_P_LINKS(rp), LINK_PID, p->common.id);
 
 	ASSERT(is_nil(ERTS_TRACER_PROC(p))
 	       || is_internal_pid(ERTS_TRACER_PROC(p))
@@ -122,7 +122,7 @@ static int insert_internal_link(Process* p, Eterm rpid)
 	}
     }
     if (IS_TRACED_FL(rp, F_TRACE_PROCS))
-	trace_proc(p, rp, am_getting_linked, p->id);
+	trace_proc(p, rp, am_getting_linked, p->common.id);
 
     if (p == rp)
 	erts_smp_proc_unlock(p, rp_locks & ~ERTS_PROC_LOCK_MAIN);
@@ -162,8 +162,8 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 
 	erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
 	
-	if (erts_add_link(&(BIF_P->nlinks), LINK_PID, BIF_ARG_1) >= 0)
-	    erts_add_link(&(pt->nlinks), LINK_PID, BIF_P->id);
+	if (erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, BIF_ARG_1) >= 0)
+	    erts_add_link(&ERTS_P_LINKS(pt), LINK_PID, BIF_P->common.id);
 	/* else: already linked */
 
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
@@ -180,7 +180,7 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 	erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
 
 	/* We may earn time by checking first that we're not linked already */
-	if (erts_lookup_link(BIF_P->nlinks, BIF_ARG_1) != NULL) {
+	if (erts_lookup_link(ERTS_P_LINKS(BIF_P), BIF_ARG_1) != NULL) {
 	    erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
 	    BIF_RET(am_true);
 	}
@@ -207,10 +207,10 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 
 		erts_smp_de_links_lock(dep);
 
-		erts_add_link(&(BIF_P->nlinks), LINK_PID, BIF_ARG_1);
+		erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, BIF_ARG_1);
 		lnk = erts_add_or_lookup_link(&(dep->nlinks),
 					      LINK_PID,
-					      BIF_P->id);
+					      BIF_P->common.id);
 		ASSERT(lnk != NULL);
 		erts_add_link(&ERTS_LINK_ROOT(lnk), LINK_PID, BIF_ARG_1);
 
@@ -218,7 +218,7 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 		erts_smp_de_runlock(dep);
 		erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
 
-		code = erts_dsig_send_link(&dsd, BIF_P->id, BIF_ARG_1);
+		code = erts_dsig_send_link(&dsd, BIF_P->common.id, BIF_ARG_1);
 		if (code == ERTS_DSIG_SEND_YIELD)
 		    ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 		BIF_RET(am_true);
@@ -287,7 +287,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
 	    if (dmon)
 		erts_destroy_monitor(dmon);
 	}
-	mon = erts_remove_monitor(&c_p->monitors, ref);
+	mon = erts_remove_monitor(&ERTS_P_MONITORS(c_p), ref);
 	erts_smp_proc_unlock(c_p, ERTS_PROC_LOCK_LINK);
 
 	res = ERTS_DEMONITOR_TRUE;
@@ -296,7 +296,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
     case ERTS_DSIG_PREP_CONNECTED:
 
 	erts_smp_de_links_lock(dep);
-	mon = erts_remove_monitor(&c_p->monitors, ref);
+	mon = erts_remove_monitor(&ERTS_P_MONITORS(c_p), ref);
 	dmon = erts_remove_monitor(&dep->monitors, ref);
 	erts_smp_de_links_unlock(dep);
 	erts_smp_de_runlock(dep);
@@ -323,7 +323,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
 	     * the atom is stored there. Yield if necessary.
 	     */
 	    code = erts_dsig_send_demonitor(&dsd,
-					    c_p->id, 
+					    c_p->common.id, 
 					    (mon->name != NIL
 					     ? mon->name
 					     : mon->pid), 
@@ -385,7 +385,7 @@ static int demonitor(Process *c_p, Eterm ref)
        goto done; /* Cannot be this monitor's ref */
    }
 
-   mon = erts_lookup_monitor(c_p->monitors, ref);
+   mon = erts_lookup_monitor(ERTS_P_MONITORS(c_p), ref);
    if (!mon) {
        res = ERTS_DEMONITOR_FALSE;
        goto done;
@@ -424,7 +424,7 @@ static int demonitor(Process *c_p, Eterm ref)
 			      to,
 			      ERTS_PROC_LOCK_LINK,
 			      ERTS_P2P_FLG_ALLOW_OTHER_X);
-       mon = erts_remove_monitor(&c_p->monitors, ref);
+       mon = erts_remove_monitor(&ERTS_P_MONITORS(c_p), ref);
 #ifndef ERTS_SMP
        ASSERT(mon);
 #else
@@ -438,7 +438,7 @@ static int demonitor(Process *c_p, Eterm ref)
        }
        if (rp) {
 	   ErtsMonitor *rmon;
-	   rmon = erts_remove_monitor(&(rp->monitors), ref);
+	   rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
 	   if (rp != c_p)
 	       erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	   if (rmon != NULL)
@@ -580,7 +580,7 @@ local_pid_monitor(Process *p, Eterm target)
 
     mon_ref = erts_make_ref(p);
     ERTS_BIF_PREP_RET(ret, mon_ref);
-    if (target == p->id) {
+    if (target == p->common.id) {
 	return ret;
     }
 
@@ -597,8 +597,8 @@ local_pid_monitor(Process *p, Eterm target)
     else {
 	ASSERT(rp != p);
 
-	erts_add_monitor(&(p->monitors), MON_ORIGIN, mon_ref, target, NIL);
-	erts_add_monitor(&(rp->monitors), MON_TARGET, mon_ref, p->id, NIL);
+	erts_add_monitor(&ERTS_P_MONITORS(p), MON_ORIGIN, mon_ref, target, NIL);
+	erts_add_monitor(&ERTS_P_MONITORS(rp), MON_TARGET, mon_ref, p->common.id, NIL);
 
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
     }
@@ -633,9 +633,9 @@ local_name_monitor(Process *p, Eterm target_name)
 	UnUseTmpHeap(3,p);
     }
     else if (rp != p) {
-	erts_add_monitor(&(p->monitors), MON_ORIGIN, mon_ref, rp->id,
+	erts_add_monitor(&ERTS_P_MONITORS(p), MON_ORIGIN, mon_ref, rp->common.id,
 			 target_name);
-	erts_add_monitor(&(rp->monitors), MON_TARGET, mon_ref, p->id,
+	erts_add_monitor(&ERTS_P_MONITORS(rp), MON_TARGET, mon_ref, p->common.id,
 			 target_name);
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
     }
@@ -687,16 +687,16 @@ remote_monitor(Process *p, Eterm bifarg1, Eterm bifarg2,
 
 	    erts_smp_de_links_lock(dep);
 
-	    erts_add_monitor(&(p->monitors), MON_ORIGIN, mon_ref, p_trgt,
+	    erts_add_monitor(&ERTS_P_MONITORS(p), MON_ORIGIN, mon_ref, p_trgt,
 			     p_name);
-	    erts_add_monitor(&(dep->monitors), MON_TARGET, mon_ref, p->id,
+	    erts_add_monitor(&(dep->monitors), MON_TARGET, mon_ref, p->common.id,
 			     d_name);
 
 	    erts_smp_de_links_unlock(dep);
 	    erts_smp_de_runlock(dep);
 	    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 
-	    code = erts_dsig_send_monitor(&dsd, p->id, target, mon_ref);
+	    code = erts_dsig_send_monitor(&dsd, p->common.id, target, mon_ref);
 	    if (code == ERTS_DSIG_SEND_YIELD)
 		ERTS_BIF_PREP_YIELD_RETURN(ret, p, mon_ref);
 	    else
@@ -953,12 +953,12 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 	}
 #endif
 
-	l = erts_remove_link(&BIF_P->nlinks, BIF_ARG_1);
+	l = erts_remove_link(&ERTS_P_LINKS(BIF_P), BIF_ARG_1);
 
 	ASSERT(pt || !l);
 
 	if (pt) {
-	    rl = erts_remove_link(&pt->nlinks, BIF_P->id);
+	    rl = erts_remove_link(&ERTS_P_LINKS(pt), BIF_P->common.id);
 	    erts_smp_port_unlock(pt);
 	    if (rl)
 		erts_destroy_link(rl);
@@ -991,7 +991,7 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 	if (ERTS_PROC_PENDING_EXIT(BIF_P))
 	    goto handle_pending_exit;
 #endif
-	l = erts_remove_link(&BIF_P->nlinks,BIF_ARG_1);
+	l = erts_remove_link(&ERTS_P_LINKS(BIF_P), BIF_ARG_1);
 
 	erts_smp_proc_unlock(BIF_P,
 			     ERTS_PROC_LOCK_LINK|ERTS_PROC_LOCK_STATUS);
@@ -1020,8 +1020,8 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 #endif
 
 	case ERTS_DSIG_PREP_CONNECTED:
-	    erts_remove_dist_link(&dld, BIF_P->id, BIF_ARG_1, dep);
-	    code = erts_dsig_send_unlink(&dsd, BIF_P->id, BIF_ARG_1);
+	    erts_remove_dist_link(&dld, BIF_P->common.id, BIF_ARG_1, dep);
+	    code = erts_dsig_send_unlink(&dsd, BIF_P->common.id, BIF_ARG_1);
 	    erts_destroy_dist_link(&dld);
 	    if (code == ERTS_DSIG_SEND_YIELD)
 		ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
@@ -1053,7 +1053,7 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 #endif
 
     /* unlink and ignore errors */
-    l = erts_remove_link(&BIF_P->nlinks,BIF_ARG_1);
+    l = erts_remove_link(&ERTS_P_LINKS(BIF_P), BIF_ARG_1);
     if (l != NULL)
 	erts_destroy_link(l);
 
@@ -1061,12 +1061,12 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
 	ERTS_SMP_ASSERT_IS_NOT_EXITING(BIF_P);
     }
     else {
-	rl = erts_remove_link(&(rp->nlinks),BIF_P->id);
+	rl = erts_remove_link(&ERTS_P_LINKS(rp), BIF_P->common.id);
 	if (rl != NULL)
 	    erts_destroy_link(rl);
 
 	if (IS_TRACED_FL(rp, F_TRACE_PROCS) && rl != NULL) {
-	    trace_proc(BIF_P, rp, am_getting_unlinked, BIF_P->id);
+	    trace_proc(BIF_P, rp, am_getting_unlinked, BIF_P->common.id);
 	}
 
 	if (rp != BIF_P)
@@ -1343,7 +1343,7 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	 erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
 	 prt = erts_id2port(BIF_ARG_1, NULL, 0);
 	 if (prt) {
-	     erts_do_exit_port(prt, BIF_P->id, BIF_ARG_2);
+	     erts_do_exit_port(prt, BIF_P->common.id, BIF_ARG_2);
 	     erts_port_release(prt);
 	 }
 	 erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
@@ -1373,7 +1373,7 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	 case ERTS_DSIG_PREP_NOT_CONNECTED:
 	     BIF_TRAP2(dexit_trap, BIF_P, BIF_ARG_1, BIF_ARG_2);
 	 case ERTS_DSIG_PREP_CONNECTED:
-	     code = erts_dsig_send_exit2(&dsd, BIF_P->id, BIF_ARG_1, BIF_ARG_2);
+	     code = erts_dsig_send_exit2(&dsd, BIF_P->common.id, BIF_ARG_1, BIF_ARG_2);
 	     if (code == ERTS_DSIG_SEND_YIELD)
 		 ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 	     BIF_RET(am_true);
@@ -1391,7 +1391,7 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	  */
 	 ErtsProcLocks rp_locks;
 
-	 if (BIF_ARG_1 == BIF_P->id) {
+	 if (BIF_ARG_1 == BIF_P->common.id) {
 	     rp_locks = ERTS_PROC_LOCKS_ALL;
 	     rp = BIF_P;
 	     erts_smp_proc_lock(rp, ERTS_PROC_LOCKS_ALL_MINOR);
@@ -1409,7 +1409,7 @@ BIF_RETTYPE exit_2(BIF_ALIST_2)
 	  * Send an exit signal.
 	  */
 	 erts_send_exit_signal(BIF_P,
-			       BIF_P->id,
+			       BIF_P->common.id,
 			       rp,
 			       &rp_locks,
 			       BIF_ARG_2,
@@ -1823,7 +1823,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 			  "Discarding message %T from %T to %T in an old "
 			  "incarnation (%d) of this node (%d)\n",
 			  msg,
-			  p->id,
+			  p->common.id,
 			  to,
 			  external_pid_creation(to),
 			  erts_this_node->creation);
@@ -1851,7 +1851,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 			  &pt);
 
 	if (pt) {
-	    portid = pt->id;
+	    portid = pt->common.id;
 	    goto port_common;
 	}
 	
@@ -1879,7 +1879,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 		      "Discarding message %T from %T to %T in an old "
 		      "incarnation (%d) of this node (%d)\n",
 		      msg,
-		      p->id,
+		      p->common.id,
 		      to,
 		      external_port_creation(to),
 		      erts_this_node->creation);
@@ -1945,7 +1945,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 	}	    
 	
 	/* XXX NO GC in port command */
-	erts_port_command(p, p->id, pt, msg);
+	erts_port_command(p, p->common.id, pt, msg);
 	if (pt) {
 	    /* Virtually schedule out the port before releasing */
 	    if (IS_TRACED_FL(pt, F_TRACE_SCHED_PORTS)) {
@@ -2006,7 +2006,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend) {
 			      &rp, 0, 0,
 			      &pt);
 	    if (pt) {
-		portid = pt->id;
+		portid = pt->common.id;
 		goto port_common;
 	    }
 	    /* Port lookup failed, virtually schedule the process
@@ -3121,7 +3121,7 @@ BIF_RETTYPE list_to_tuple_1(BIF_ALIST_1)
 
 BIF_RETTYPE self_0(BIF_ALIST_0)
 {
-     BIF_RET(BIF_P->id);
+     BIF_RET(BIF_P->common.id);
 }
 
 /**********************************************************************/
@@ -3455,7 +3455,7 @@ BIF_RETTYPE garbage_collect_1(BIF_ALIST_1)
 	BIF_ERROR(BIF_P, BADARG);
     }
 
-    if (BIF_P->id == BIF_ARG_1)
+    if (BIF_P->common.id == BIF_ARG_1)
 	rp = BIF_P;
     else {
 #ifdef ERTS_SMP
@@ -3544,7 +3544,7 @@ BIF_RETTYPE ports_0(BIF_ALIST_0)
 	    state = erts_smp_atomic32_read_nob(&prt->state);
 	    if (!(state & ERTS_PORT_SFLGS_DEAD) && prt->snapshot != next_ss) {
 		ASSERT(prt->snapshot == next_ss - 1);
-		*pp++ = prt->id;
+		*pp++ = prt->common.id;
 		prt->snapshot = next_ss; /* Consumed by this snapshot */
 	    }
 	    erts_smp_port_minor_unlock(prt);
@@ -4745,14 +4745,14 @@ BIF_RETTYPE dt_spread_tag_1(BIF_ALIST_1)
 #ifdef DTRACE_TAG_HARDDEBUG
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) start spreading tag %T\r\n",
-			 BIF_P->id,DT_UTAG(BIF_P));
+			 BIF_P->common.id,DT_UTAG(BIF_P));
 #endif
 	} else {
 	    DT_UTAG_FLAGS(BIF_P) &= ~DT_UTAG_SPREADING;
 #ifdef DTRACE_TAG_HARDDEBUG
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) stop spreading tag %T\r\n",
-			 BIF_P->id,DT_UTAG(BIF_P));
+			 BIF_P->common.id,DT_UTAG(BIF_P));
 #endif
 	}
     }
@@ -4778,7 +4778,7 @@ BIF_RETTYPE dt_restore_tag_1(BIF_ALIST_1)
 #ifdef DTRACE_TAG_HARDDEBUG
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) restore Killing tag!\r\n",
-			 BIF_P->id);
+			 BIF_P->common.id);
 #endif
 	}
 	DT_UTAG(BIF_P) = NIL;
@@ -4795,12 +4795,12 @@ BIF_RETTYPE dt_restore_tag_1(BIF_ALIST_1)
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) restore stop spreading "
 			 "tag %T\r\n",
-			 BIF_P->id, tpl[2]);
+			 BIF_P->common.id, tpl[2]);
 	} else if ((x & DT_UTAG_SPREADING) && 
 		   !(DT_UTAG_FLAGS(BIF_P) & DT_UTAG_SPREADING)) {
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) restore start spreading "
-			 "tag %T\r\n",BIF_P->id,tpl[2]);
+			 "tag %T\r\n",BIF_P->common.id,tpl[2]);
 	}
 #endif
 	DT_UTAG_FLAGS(BIF_P) = x;
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index bcc8700bc8..fba734623a 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -196,7 +196,7 @@ print_process_info(int to, void *to_arg, Process *p)
     erts_aint32_t state;
 
     /* display the PID */
-    erts_print(to, to_arg, "=proc:%T\n", p->id);
+    erts_print(to, to_arg, "=proc:%T\n", p->common.id);
 
     /* Display the state */
     erts_print(to, to_arg, "State: ");
@@ -301,11 +301,11 @@ print_process_info(int to, void *to_arg, Process *p)
     }
 
     /* display the links only if there are any*/
-    if (p->nlinks != NULL || p->monitors != NULL) {
+    if (ERTS_P_LINKS(p) || ERTS_P_MONITORS(p)) {
 	PrintMonitorContext context = {1,to}; 
 	erts_print(to, to_arg,"Link list: [");
-	erts_doforall_links(p->nlinks, &doit_print_link, &context);	
-	erts_doforall_monitors(p->monitors, &doit_print_monitor, &context);
+	erts_doforall_links(ERTS_P_LINKS(p), &doit_print_link, &context);	
+	erts_doforall_monitors(ERTS_P_MONITORS(p), &doit_print_monitor, &context);
 	erts_print(to, to_arg,"]\n");
     }
 
@@ -628,7 +628,7 @@ bin_check(void)
 	    if (hdr->thing_word == HEADER_PROC_BIN) {
 		ProcBin *bp = (ProcBin*) hdr;
 		if (!printed) {
-		    erts_printf("Process %T holding binary data \n", rp->id);
+		    erts_printf("Process %T holding binary data \n", rp->common.id);
 		    printed = 1;
 		}
 		erts_printf("%p orig_size: %bpd, norefs = %bpd\n",
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index d7345c2f54..04e1805088 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -64,7 +64,7 @@ copy_object(Eterm obj, Process* to)
     if (DTRACE_ENABLED(copy_object)) {
         DTRACE_CHARBUF(proc_name, 64);
 
-        erts_snprintf(proc_name, sizeof(proc_name), "%T", to->id);
+        erts_snprintf(proc_name, sizeof(proc_name), "%T", to->common.id);
         DTRACE2(copy_object, proc_name, size);
     }
 #endif
@@ -575,7 +575,7 @@ Eterm copy_struct_lazy(Process *from, Eterm orig, Uint offs)
 
     VERBOSE(DEBUG_MESSAGES,
             ("COPY START; %T is sending a message @ 0x%016x\n%T\n",
-             from->id, orig, orig));
+             from->common.id, orig, orig));
 
 #ifndef INCREMENTAL
  copy_start:
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index eccef44a11..7aef26aa21 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -252,7 +252,7 @@ static void doit_monitor_net_exits(ErtsMonitor *mon, void *vnecp)
 
     if (mon->type == MON_ORIGIN) {
 	/* local pid is beeing monitored */
-	rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
+	rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), mon->ref);
 	/* ASSERT(rmon != NULL); nope, can happen during process exit */
 	if (rmon != NULL) {
 	    erts_destroy_monitor(rmon);
@@ -262,7 +262,7 @@ static void doit_monitor_net_exits(ErtsMonitor *mon, void *vnecp)
 	Eterm watched;
 	UseTmpHeapNoproc(3);
 	ASSERT(mon->type == MON_TARGET);
-	rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
+	rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), mon->ref);
 	/* ASSERT(rmon != NULL); can happen during process exit */
 	if (rmon != NULL) {
 	    ASSERT(is_atom(rmon->name) || is_nil(rmon->name));
@@ -311,7 +311,7 @@ static void doit_link_net_exits_sub(ErtsLink *sublnk, void *vlnecp)
 	    goto done;
 	}
 
-	rlnk = erts_remove_link(&(rp->nlinks), sublnk->pid);
+	rlnk = erts_remove_link(&ERTS_P_LINKS(rp), sublnk->pid);
 	xres = erts_send_exit_signal(NULL,
 				     sublnk->pid,
 				     rp,
@@ -370,7 +370,7 @@ static void doit_node_link_net_exits(ErtsLink *lnk, void *vnecp)
 	if (!rp) {
 	    goto done;
 	}
-	rlnk = erts_remove_link(&(rp->nlinks), name);
+	rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
 	if (rlnk != NULL) {
 	    ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
 	    erts_destroy_link(rlnk);
@@ -770,7 +770,7 @@ erts_dsig_send_msg(ErtsDSigData *dsdp, Eterm remote, Eterm message)
     *node_name = *sender_name = *receiver_name = '\0';
     if (DTRACE_ENABLED(message_send) || DTRACE_ENABLED(message_send_remote)) {
         erts_snprintf(node_name, sizeof(node_name), "%T", dsdp->dep->sysname);
-        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->id);
+        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->common.id);
         erts_snprintf(receiver_name, sizeof(receiver_name), "%T", remote);
         msize = size_object(message);
         if (token != NIL && token != am_have_dt_utag) {
@@ -827,7 +827,7 @@ erts_dsig_send_reg_msg(ErtsDSigData *dsdp, Eterm remote_name, Eterm message)
     *node_name = *sender_name = *receiver_name = '\0';
     if (DTRACE_ENABLED(message_send) || DTRACE_ENABLED(message_send_remote)) {
         erts_snprintf(node_name, sizeof(node_name), "%T", dsdp->dep->sysname);
-        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->id);
+        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->common.id);
         erts_snprintf(receiver_name, sizeof(receiver_name),
                       "{%T,%s}", remote_name, node_name);
         msize = size_object(message);
@@ -841,10 +841,10 @@ erts_dsig_send_reg_msg(ErtsDSigData *dsdp, Eterm remote_name, Eterm message)
 
     if (token != NIL)
 	ctl = TUPLE5(&ctl_heap[0], make_small(DOP_REG_SEND_TT),
-		     sender->id, am_Cookie, remote_name, token);
+		     sender->common.id, am_Cookie, remote_name, token);
     else
 	ctl = TUPLE4(&ctl_heap[0], make_small(DOP_REG_SEND),
-		     sender->id, am_Cookie, remote_name);
+		     sender->common.id, am_Cookie, remote_name);
     DTRACE6(message_send, sender_name, receiver_name,
             msize, tok_label, tok_lastcnt, tok_serial);
     DTRACE7(message_send_remote, sender_name, node_name, receiver_name,
@@ -890,7 +890,7 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
     *node_name = *sender_name = *remote_name = '\0';
     if (DTRACE_ENABLED(process_exit_signal_remote)) {
         erts_snprintf(node_name, sizeof(node_name), "%T", dsdp->dep->sysname);
-        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->id);
+        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->common.id);
         erts_snprintf(remote_name, sizeof(remote_name),
                       "{%T,%s}", remote, node_name);
         erts_snprintf(reason_str, sizeof(reason), "%T", reason);
@@ -1142,7 +1142,7 @@ int erts_net_message(Port *prt,
 	}
 
 	erts_smp_de_links_lock(dep);
-	res = erts_add_link(&(rp->nlinks), LINK_PID, from);
+	res = erts_add_link(&ERTS_P_LINKS(rp), LINK_PID, from);
 
 	if (res < 0) {
 	    /* It was already there! Lets skip the rest... */
@@ -1150,7 +1150,7 @@ int erts_net_message(Port *prt,
 	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	    break;
 	}
-	lnk = erts_add_or_lookup_link(&(dep->nlinks), LINK_PID, rp->id);
+	lnk = erts_add_or_lookup_link(&(dep->nlinks), LINK_PID, rp->common.id);
 	erts_add_link(&(ERTS_LINK_ROOT(lnk)), LINK_PID, from);
 	erts_smp_de_links_unlock(dep);
 
@@ -1177,7 +1177,7 @@ int erts_net_message(Port *prt,
 	if (!rp)
 	    break;
 
-	lnk = erts_remove_link(&(rp->nlinks), from);
+	lnk = erts_remove_link(&ERTS_P_LINKS(rp), from);
 
 	if (IS_TRACED_FL(rp, F_TRACE_PROCS) && lnk != NULL) {
 	    trace_proc(NULL, rp, am_getting_unlinked, from);
@@ -1234,10 +1234,10 @@ int erts_net_message(Port *prt,
 	}
 	else {
 	    if (is_atom(watched))
-		watched = rp->id;
+		watched = rp->common.id;
 	    erts_smp_de_links_lock(dep);
 	    erts_add_monitor(&(dep->monitors), MON_ORIGIN, ref, watched, name);
-	    erts_add_monitor(&(rp->monitors), MON_TARGET, ref, watcher, name);
+	    erts_add_monitor(&ERTS_P_MONITORS(rp), MON_TARGET, ref, watcher, name);
 	    erts_smp_de_links_unlock(dep);
 	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	}
@@ -1276,7 +1276,7 @@ int erts_net_message(Port *prt,
 	if (!rp) {
 	    break;
 	}
-	mon = erts_remove_monitor(&(rp->monitors),ref);
+	mon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	ASSERT(mon != NULL);
 	if (mon == NULL) {
@@ -1433,7 +1433,7 @@ int erts_net_message(Port *prt,
 
 	erts_destroy_monitor(mon);
 
-	mon = erts_remove_monitor(&(rp->monitors),ref);
+	mon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
 
 	if (mon == NULL) {
 	    erts_smp_proc_unlock(rp, rp_locks);
@@ -1484,7 +1484,7 @@ int erts_net_message(Port *prt,
 	if (!rp)
 	    lnk = NULL;
 	else {
-	    lnk = erts_remove_link(&(rp->nlinks), from);
+	    lnk = erts_remove_link(&ERTS_P_LINKS(rp), from);
 
 	    /* If lnk == NULL, we have unlinked on this side, i.e.
 	     * ignore exit.
@@ -1784,7 +1784,7 @@ dsig_send(ErtsDSigData *dsdp, Eterm ctl, Eterm msg, int force_busy)
 
             erts_snprintf(port_str, sizeof(port_str), "%T", cid);
             erts_snprintf(remote_str, sizeof(remote_str), "%T", dep->sysname);
-            erts_snprintf(pid_str, sizeof(pid_str), "%T", c_p->id);
+            erts_snprintf(pid_str, sizeof(pid_str), "%T", c_p->common.id);
             DTRACE4(dist_port_busy, erts_this_node_sysname,
                     port_str, remote_str, pid_str);
         }
@@ -1817,7 +1817,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf)
         DTRACE_CHARBUF(port_str, 64);
         DTRACE_CHARBUF(remote_str, 64);
 
-        erts_snprintf(port_str, sizeof(port_str), "%T", prt->id);
+        erts_snprintf(port_str, sizeof(port_str), "%T", prt->common.id);
         erts_snprintf(remote_str, sizeof(remote_str),
                       "%T", prt->dist_entry->sysname);
         DTRACE4(dist_output, erts_this_node_sysname, port_str,
@@ -1871,7 +1871,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
         DTRACE_CHARBUF(port_str, 64);
         DTRACE_CHARBUF(remote_str, 64);
 
-        erts_snprintf(port_str, sizeof(port_str), "%T", prt->id);
+        erts_snprintf(port_str, sizeof(port_str), "%T", prt->common.id);
         erts_snprintf(remote_str, sizeof(remote_str),
                       "%T", prt->dist_entry->sysname);
         DTRACE4(dist_outputv, erts_this_node_sysname, port_str,
@@ -1930,7 +1930,7 @@ erts_dist_command(Port *prt, int reds_limit)
     erts_smp_de_runlock(dep);
 
     if (status & ERTS_DE_SFLG_EXITING) {
-	erts_do_exit_port(prt, prt->id, am_killed);
+	erts_do_exit_port(prt, prt->common.id, am_killed);
 	erts_deref_dist_entry(dep);
 	return reds + ERTS_PORT_REDS_DIST_CMD_EXIT;
     }
@@ -2203,7 +2203,7 @@ erts_dist_port_not_busy(Port *prt)
         DTRACE_CHARBUF(port_str, 64);
         DTRACE_CHARBUF(remote_str, 64);
 
-        erts_snprintf(port_str, sizeof(port_str), "%T", prt->id);
+        erts_snprintf(port_str, sizeof(port_str), "%T", prt->common.id);
         erts_snprintf(remote_str, sizeof(remote_str),
                       "%T", prt->dist_entry->sysname);
         DTRACE3(dist_port_not_busy, erts_this_node_sysname,
@@ -2245,7 +2245,7 @@ static void doit_print_monitor_info(ErtsMonitor *mon, void *vptdp)
     Process *rp;
     ErtsMonitor *rmon;
     rp = erts_proc_lookup(mon->pid);
-    if (!rp || (rmon = erts_lookup_monitor(rp->monitors, mon->ref)) == NULL) {
+    if (!rp || (rmon = erts_lookup_monitor(ERTS_P_MONITORS(rp), mon->ref)) == NULL) {
 	erts_print(to, arg, "Warning, stray monitor for: %T\n", mon->pid);
     } else if (mon->type == MON_ORIGIN) {
 	/* Local pid is being monitored */
@@ -2558,7 +2558,7 @@ BIF_RETTYPE setnode_3(BIF_ALIST_3)
     /* DFLAG_EXTENDED_REFERENCES is compulsory from R9 and forward */
     if (!(DFLAG_EXTENDED_REFERENCES & flags)) {
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	erts_dsprintf(dsbufp, "%T", BIF_P->id);
+	erts_dsprintf(dsbufp, "%T", BIF_P->common.id);
 	if (BIF_P->common.u.alive.reg)
 	    erts_dsprintf(dsbufp, " (%T)", BIF_P->common.u.alive.reg->name);
 	erts_dsprintf(dsbufp,
@@ -2702,7 +2702,7 @@ BIF_RETTYPE dist_exit_3(BIF_ALIST_3)
     if (is_internal_pid(local)) {
 	Process *lp;
 	ErtsProcLocks lp_locks;
-	if (BIF_P->id == local) {
+	if (BIF_P->common.id == local) {
 	    lp_locks = ERTS_PROC_LOCKS_ALL;
 	    lp = BIF_P;
 	    erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCKS_ALL_MINOR);
@@ -2932,23 +2932,23 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
     if (Bool == am_true) {
 	ASSERT(dep->cid != NIL);
 	lnk = erts_add_or_lookup_link(&(dep->node_links), LINK_NODE, 
-				      p->id);
+				      p->common.id);
 	++ERTS_LINK_REFC(lnk);
-	lnk = erts_add_or_lookup_link(&(p->nlinks), LINK_NODE, Node);
+	lnk = erts_add_or_lookup_link(&ERTS_P_LINKS(p), LINK_NODE, Node);
 	++ERTS_LINK_REFC(lnk);
     }
     else  {
-	lnk = erts_lookup_link(dep->node_links, p->id);
+	lnk = erts_lookup_link(dep->node_links, p->common.id);
 	if (lnk != NULL) {
 	    if ((--ERTS_LINK_REFC(lnk)) == 0) {
 		erts_destroy_link(erts_remove_link(&(dep->node_links), 
-						   p->id));
+						   p->common.id));
 	    }
 	}
-	lnk = erts_lookup_link(p->nlinks, Node);
+	lnk = erts_lookup_link(ERTS_P_LINKS(p), Node);
 	if (lnk != NULL) {
 	    if ((--ERTS_LINK_REFC(lnk)) == 0) {
-		erts_destroy_link(erts_remove_link(&(p->nlinks),
+		erts_destroy_link(erts_remove_link(&ERTS_P_LINKS(p),
 						   Node));
 	    }
 	}
@@ -3510,7 +3510,7 @@ erts_processes_monitoring_nodes(Process *c_p)
 		olist = erts_bld_cons(hpp, szp, am_nodedown_reason, olist);
 	    res = erts_bld_cons(hpp, szp,
 				erts_bld_tuple(hpp, szp, 2,
-					       nmp->proc->id,
+					       nmp->proc->common.id,
 					       olist),
 				res);
 	}
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index 0cefd73459..98c069da8a 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -192,7 +192,7 @@ void erts_schedule_dist_command(Port *prt, DistEntry *dist_entry)
 	ASSERT(prt->dist_entry);
 
 	dep = prt->dist_entry;
-	id = prt->id;
+	id = prt->common.id;
     }
     else {
 	ASSERT(dist_entry);
diff --git a/erts/emulator/beam/erl_async.c b/erts/emulator/beam/erl_async.c
index bce9d07a01..8d3bea82c1 100644
--- a/erts/emulator/beam/erl_async.c
+++ b/erts/emulator/beam/erl_async.c
@@ -611,7 +611,7 @@ long driver_async(ErlDrvPort ix, unsigned int* key,
     a->sched_id = sched_id;
 #endif
     a->hndl = (DE_Handle*)prt->drv_ptr->handle;
-    a->port = prt->id;
+    a->port = prt->common.id;
     a->pdl = NULL;
     a->async_data = async_data;
     a->async_invoke = async_invoke;
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index dfb8b453c4..a120a3e5f2 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -133,7 +133,7 @@ kill_ports_driver_unloaded(DE_Handle *dh)
 	    continue;
 	}
 
-	erts_smp_atomic_inc_nob(&prt->refc);
+	erts_smp_atomic32_inc_nob(&prt->common.refc);
 	erts_smp_port_minor_unlock(prt);
 
 	state = erts_smp_atomic32_read_acqb(&prt->state);
@@ -1892,7 +1892,7 @@ static int build_proc_info(DE_Handle *dh, ProcEntryInfo **out_pei, Uint filter)
     assert_drv_list_locked();
 
     for (pe = dh->procs; pe != NULL; pe = pe->next) {
-	Eterm id = pe->proc->id;
+	Eterm id = pe->proc->common.id;
 	Uint stat = pe->awaiting_status;
 	if (stat == ERL_DE_PROC_AWAIT_UNLOAD_ONLY) {
 	    stat = ERL_DE_PROC_AWAIT_UNLOAD;
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 6b71eddc8b..847a0c33e9 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1226,7 +1226,7 @@ process_info_aux(Process *BIF_P,
 
 	INIT_MONITOR_INFOS(mic);
 
-	erts_doforall_links(rp->nlinks,&collect_one_link,&mic);
+	erts_doforall_links(ERTS_P_LINKS(rp),&collect_one_link,&mic);
 
 	hp = HAlloc(BIF_P, 3 + mic.sz);
 	res = NIL;
@@ -1244,7 +1244,7 @@ process_info_aux(Process *BIF_P,
 	int i;
 
 	INIT_MONITOR_INFOS(mic);
-	erts_doforall_monitors(rp->monitors,&collect_one_origin_monitor,&mic);
+	erts_doforall_monitors(ERTS_P_MONITORS(rp),&collect_one_origin_monitor,&mic);
 	hp = HAlloc(BIF_P, 3 + mic.sz);
 	res = NIL;
 	for (i = 0; i < mic.mi_i; i++) {
@@ -1281,7 +1281,7 @@ process_info_aux(Process *BIF_P,
 	Eterm item;
 
 	INIT_MONITOR_INFOS(mic);
-	erts_doforall_monitors(rp->monitors,&collect_one_target_monitor,&mic);
+	erts_doforall_monitors(ERTS_P_MONITORS(rp),&collect_one_target_monitor,&mic);
 	hp = HAlloc(BIF_P, 3 + mic.sz);
 
 	res = NIL;
@@ -1443,8 +1443,8 @@ process_info_aux(Process *BIF_P,
 
 	ERTS_SMP_MSGQ_MV_INQ2PRIVQ(rp);
 
-	erts_doforall_links(rp->nlinks, &one_link_size, &size);
-	erts_doforall_monitors(rp->monitors, &one_mon_size, &size);
+	erts_doforall_links(ERTS_P_LINKS(rp), &one_link_size, &size);
+	erts_doforall_monitors(ERTS_P_MONITORS(rp), &one_mon_size, &size);
 	size += (rp->heap_sz + rp->mbuf_sz) * sizeof(Eterm);
 	if (rp->old_hend && rp->old_heap)
 	    size += (rp->old_hend - rp->old_heap) * sizeof(Eterm);
@@ -1632,7 +1632,7 @@ current_function(Process* BIF_P, Process* rp, Eterm** hpp, int full_info)
 	}
     }
 
-    if (BIF_P->id == rp->id) {
+    if (BIF_P == rp) {
 	FunctionInfo fi2;
 
 	/*
@@ -2866,7 +2866,7 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item)
 
 	INIT_MONITOR_INFOS(mic);
 
-	erts_doforall_links(prt->nlinks, &collect_one_link, &mic);
+	erts_doforall_links(ERTS_P_LINKS(prt), &collect_one_link, &mic);
 
 	hp = HAlloc(p, 3 + mic.sz);
 	res = NIL;
@@ -2885,7 +2885,7 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item)
 
 	INIT_MONITOR_INFOS(mic);
 
-	erts_doforall_monitors(prt->monitors, &collect_one_origin_monitor, &mic);
+	erts_doforall_monitors(ERTS_P_MONITORS(prt), &collect_one_origin_monitor, &mic);
 
 	hp = HAlloc(p, 3 + mic.sz);
 	res = NIL;
@@ -2926,7 +2926,7 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item)
     }
     else if (item == am_registered_name) {
 	RegProc *reg;
-	reg = prt->reg;
+	reg = prt->common.u.alive.reg;
 	if (reg == NULL) {
 	    ERTS_BIF_PREP_RET(ret, NIL);
 	    goto done;
@@ -2945,7 +2945,7 @@ static BIF_RETTYPE port_info(Process* p, Eterm portid, Eterm item)
 
 	hp = HAlloc(p, 3);
 
-	erts_doforall_links(prt->nlinks, &one_link_size, &size);
+	erts_doforall_links(ERTS_P_LINKS(prt), &one_link_size, &size);
 
 	for (bp = prt->bp; bp; bp = bp->next)
 	    size += sizeof(ErlHeapFragment) + (bp->alloc_size - 1)*sizeof(Eterm);
@@ -3136,7 +3136,7 @@ BIF_RETTYPE is_process_alive_1(BIF_ALIST_1)
    if(is_internal_pid(BIF_ARG_1)) {
        Process *rp;
 
-       if (BIF_ARG_1 == BIF_P->id)
+       if (BIF_ARG_1 == BIF_P->common.id)
 	   BIF_RET(am_true);
 
        rp = erts_proc_lookup(BIF_ARG_1);
@@ -3460,7 +3460,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 			ERTS_SMP_ASSERT_IS_NOT_EXITING(BIF_P);
 			BIF_RET(am_undefined);
 		    }
-		    res = make_link_list(BIF_P, p->nlinks, NIL);
+		    res = make_link_list(BIF_P, ERTS_P_LINKS(p), NIL);
 		    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 		    BIF_RET(res);
 		}
@@ -3469,7 +3469,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 		    Port *p = erts_id2port(tp[2], BIF_P, ERTS_PROC_LOCK_MAIN);
 		    if(!p)
 			BIF_RET(am_undefined);
-		    res = make_link_list(BIF_P, p->nlinks, NIL);
+		    res = make_link_list(BIF_P, ERTS_P_LINKS(p), NIL);
 		    erts_smp_port_unlock(p);
 		    BIF_RET(res);
 		}
@@ -3502,7 +3502,7 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_1)
 			ERTS_SMP_ASSERT_IS_NOT_EXITING(BIF_P);
 			BIF_RET(am_undefined);
 		    }
-		    res = make_monitor_list(BIF_P, p->monitors);
+		    res = make_monitor_list(BIF_P, ERTS_P_MONITORS(p));
 		    erts_smp_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 		    BIF_RET(res);
 		} else if(is_node_name_atom(tp[2])) {
@@ -3645,7 +3645,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 	erts_aint_t prev_on = erts_smp_atomic_xchg_nob(&available_internal_state, on);
 	if (on) {
 	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	    erts_dsprintf(dsbufp, "Process %T ", BIF_P->id);
+	    erts_dsprintf(dsbufp, "Process %T ", BIF_P->common.id);
 	    if (erts_is_alive)
 		erts_dsprintf(dsbufp, "on node %T ", erts_this_node->sysname);
 	    erts_dsprintf(dsbufp,
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index 1a5b05fcfc..2b7760f556 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -74,9 +74,9 @@ BIF_RETTYPE open_port_2(BIF_ALIST_2)
 
     erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
 
-    port_val = erts_port[port_num].id;
-    erts_add_link(&(erts_port[port_num].nlinks), LINK_PID, BIF_P->id);
-    erts_add_link(&(BIF_P->nlinks), LINK_PID, port_val);
+    port_val = erts_port[port_num].common.id;
+    erts_add_link(&ERTS_P_LINKS(&erts_port[port_num]), LINK_PID, BIF_P->common.id);
+    erts_add_link(&ERTS_P_LINKS(BIF_P), LINK_PID, port_val);
 
     erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
 
@@ -171,7 +171,7 @@ do_port_command(Process *BIF_P, Eterm arg1, Eterm arg2, Eterm arg3,
 	else {
 	    erts_suspend(BIF_P, ERTS_PROC_LOCK_MAIN, p);
 	    if (erts_system_monitor_flags.busy_port) {
-		monitor_generic(BIF_P, am_busy_port, p->id);
+		monitor_generic(BIF_P, am_busy_port, p->common.id);
 	    }
 	    ERTS_BIF_PREP_YIELD3(res, bif_export[BIF_port_command_3], BIF_P,
 				 arg1, arg2, arg3);
@@ -180,7 +180,7 @@ do_port_command(Process *BIF_P, Eterm arg1, Eterm arg2, Eterm arg3,
 	int wres;
 	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
 	ERTS_SMP_CHK_NO_PROC_LOCKS;
-	wres = erts_write_to_port(BIF_P->id, p, arg2);
+	wres = erts_write_to_port(BIF_P->common.id, p, arg2);
 	erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
 	if (wres != 0) {
 	    ERTS_BIF_PREP_ERROR(res, BIF_P, BADARG);
@@ -321,7 +321,7 @@ port_call(Process* c_p, Eterm arg1, Eterm arg2, Eterm arg3)
     if (!term_to_Uint(arg2, &op)) {
 	goto error;
     }
-    p->caller = c_p->id;
+    p->caller = c_p->common.id;
     
     /* Lock taken, virtual schedule of port */
     if (IS_TRACED_FL(p, F_TRACE_SCHED_PORTS)) {
@@ -543,8 +543,8 @@ BIF_RETTYPE port_connect_2(BIF_ALIST_2)
 	goto error;
     }
 
-    erts_add_link(&(rp->nlinks), LINK_PID, prt->id);
-    erts_add_link(&(prt->nlinks), LINK_PID, pid);
+    erts_add_link(&ERTS_P_LINKS(rp), LINK_PID, prt->common.id);
+    erts_add_link(&ERTS_P_LINKS(prt), LINK_PID, pid);
 
     erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 
@@ -923,7 +923,7 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_nump)
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
 
-    port_num = erts_open_driver(driver, p->id, name_buf, &opts, err_nump);
+    port_num = erts_open_driver(driver, p->common.id, name_buf, &opts, err_nump);
 #ifdef USE_VM_PROBES
     if (port_num >= 0 && DTRACE_ENABLED(port_open)) {
         DTRACE_CHARBUF(process_str, DTRACE_TERM_BUF_SIZE);
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c
index cf58e6cb2b..d67695e533 100644
--- a/erts/emulator/beam/erl_bif_timer.c
+++ b/erts/emulator/beam/erl_bif_timer.c
@@ -613,7 +613,7 @@ erts_print_bif_timer_info(int to, void *to_arg)
 	for (btm = bif_timer_tab[i]; btm; btm = btm->tab.next) {
 	    Eterm receiver = (btm->flags & BTM_FLG_BYNAME
 			      ? btm->receiver.name
-			      : btm->receiver.proc.ess->id);
+			      : btm->receiver.proc.ess->common.id);
 	    erts_print(to, to_arg, "=timer:%T\n", receiver);
 	    erts_print(to, to_arg, "Message: %T\n", btm->message);
 	    erts_print(to, to_arg, "Time left: %u ms\n",
@@ -696,7 +696,7 @@ erts_bif_timer_foreach(void (*func)(Eterm, Eterm, ErlHeapFragment *, void *),
 	for (btm = bif_timer_tab[i]; btm; btm = btm->tab.next) {
 	    (*func)((btm->flags & BTM_FLG_BYNAME
 		     ? btm->receiver.name
-		     : btm->receiver.proc.ess->id),
+		     : btm->receiver.proc.ess->common.id),
 		    btm->message,
 		    btm->bp,
 		    arg);
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 01d714d57f..d94b05fc25 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -106,7 +106,7 @@ trace_pattern(Process* p, Eterm MFA, Eterm Pattern, Eterm flaglist)
     struct trace_pattern_flags flags = erts_trace_pattern_flags_off;
     int is_global;
     Process *meta_tracer_proc = p;
-    Eterm meta_tracer_pid = p->id;
+    Eterm meta_tracer_pid = p->common.id;
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
     erts_smp_thr_progress_block();
@@ -469,7 +469,7 @@ Eterm trace_3(BIF_ALIST_3)
     if (is_nil(tracer) || is_internal_pid(tracer)) {
 	Process *tracer_proc = erts_pid2proc(p,
 					     ERTS_PROC_LOCK_MAIN,
-					     is_nil(tracer) ? p->id : tracer,
+					     is_nil(tracer) ? p->common.id : tracer,
 					     ERTS_PROC_LOCKS_ALL);
 	if (!tracer_proc)
 	    goto error;
@@ -497,7 +497,7 @@ Eterm trace_3(BIF_ALIST_3)
     case am_true: 
 	on = 1;
 	if (is_nil(tracer))
-	    tracer = p->id;
+	    tracer = p->common.id;
 	break;
     default: 
 	goto error;
@@ -658,7 +658,7 @@ Eterm trace_3(BIF_ALIST_3)
 		    if (! tracee_p) 
 			continue;
 		    if (tracer != NIL) {
-			if (tracee_p->id == tracer)
+			if (tracee_p->common.id == tracer)
 			    continue;
 			if (already_traced(NULL, tracee_p, tracer))
 			    continue;
@@ -684,7 +684,7 @@ Eterm trace_3(BIF_ALIST_3)
 		    state = erts_smp_atomic32_read_nob(&tracee_port->state);
 		    if (state & ERTS_PORT_SFLGS_DEAD) continue;
 		    if (tracer != NIL) {
-			if (tracee_port->id == tracer) continue;
+			if (tracee_port->common.id == tracer) continue;
 			if (port_already_traced(NULL, tracee_port, tracer)) continue;
 		    }
 
@@ -1777,7 +1777,7 @@ new_seq_trace_token(Process* p)
 	SEQ_TRACE_TOKEN(p) = TUPLE5(hp, make_small(0),		/* Flags  */ 
 				    make_small(0),		/* Label  */
 				    make_small(0),		/* Serial */
-				    p->id, /* Internal pid */	/* From   */
+				    p->common.id, /* Internal pid */	/* From   */
 				    make_small(p->seq_trace_lastcnt));
     }
 }
@@ -2232,7 +2232,7 @@ trace_delivered_1(BIF_ALIST_1)
     msg = TUPLE3(hp, AM_trace_delivered, BIF_ARG_1, msg_ref);
 
 #ifdef ERTS_SMP
-    erts_send_sys_msg_proc(BIF_P->id, BIF_P->id, msg, bp);
+    erts_send_sys_msg_proc(BIF_P->common.id, BIF_P->common.id, msg, bp);
     if (p)
 	erts_smp_proc_unlock(p,
 			     (BIF_P == p
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index 92687336a2..cb03f37ebf 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -426,7 +426,8 @@ DbTable* db_get_table_aux(Process *p,
     if (tb) {
 	db_lock(tb, kind);
 	if (tb->common.id != id
-	    || ((tb->common.status & what) == 0 && p->id != tb->common.owner)) {
+	    || ((tb->common.status & what) == 0
+		&& p->common.id != tb->common.owner)) {
 	    db_unlock(tb, kind);
 	    tb = NULL;
 	}
@@ -616,7 +617,7 @@ BIF_RETTYPE ets_safe_fixtable_2(BIF_ALIST_2)
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
 		"ets:safe_fixtable(%T,%T); Process: %T, initial: %T:%T/%bpu\n",
-		BIF_ARG_1, BIF_ARG_2, BIF_P->id,
+		BIF_ARG_1, BIF_ARG_2, BIF_P->common.id,
 		BIF_P->initial[0], BIF_P->initial[1], BIF_P->initial[2]);
 #endif
     kind = (BIF_ARG_2 == am_true) ? LCK_READ : LCK_WRITE_REC; 
@@ -1195,7 +1196,7 @@ BIF_RETTYPE ets_rename_2(BIF_ALIST_2)
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
 		"ets:rename(%T,%T); Process: %T, initial: %T:%T/%bpu\n",
-		BIF_ARG_1, BIF_ARG_2, BIF_P->id,
+		BIF_ARG_1, BIF_ARG_2, BIF_P->common.id,
 		BIF_P->initial[0], BIF_P->initial[1], BIF_P->initial[2]);
 #endif
 
@@ -1439,7 +1440,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     db_init_lock(tb, status & (DB_FINE_LOCKED|DB_FREQ_READ),
 		 "db_tab", "db_tab_fix");
     tb->common.keypos = keypos;
-    tb->common.owner = BIF_P->id;
+    tb->common.owner = BIF_P->common.id;
     set_heir(BIF_P, tb, heir, heir_data);
 
     erts_smp_atomic_init_nob(&tb->common.nitems, 0);
@@ -1508,7 +1509,7 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
 		"ets:new(%T,%T)=%T; Process: %T, initial: %T:%T/%bpu\n",
-		 BIF_ARG_1, BIF_ARG_2, ret, BIF_P->id,
+		 BIF_ARG_1, BIF_ARG_2, ret, BIF_P->common.id,
 		 BIF_P->initial[0], BIF_P->initial[1], BIF_P->initial[2]);
 	erts_fprintf(stderr, "ets: new: meta_pid_to_tab common.memory_size = %ld\n",
 		     erts_smp_atomic_read_nob(&meta_pid_to_tab->common.memory_size));
@@ -1520,7 +1521,9 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 
     db_meta_lock(meta_pid_to_tab, LCK_WRITE_REC);
     if (db_put_hash(meta_pid_to_tab,
-		    TUPLE2(meta_tuple, BIF_P->id, make_small(slot)),
+		    TUPLE2(meta_tuple,
+			   BIF_P->common.id,
+			   make_small(slot)),
 		    0) != DB_ERROR_NONE) {
 	erl_exit(1,"Could not update ets metadata.");
     }
@@ -1639,7 +1642,7 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
 #ifdef HARDDEBUG
     erts_fprintf(stderr,
 		"ets:delete(%T); Process: %T, initial: %T:%T/%bpu\n",
-		BIF_ARG_1, BIF_P->id,
+		BIF_ARG_1, BIF_P->common.id,
 		BIF_P->initial[0], BIF_P->initial[1], BIF_P->initial[2]);
 #endif
 
@@ -1656,7 +1659,7 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
     tb->common.status &= ~(DB_PROTECTED|DB_PUBLIC|DB_PRIVATE);
     tb->common.status |= DB_DELETE;
 
-    if (tb->common.owner != BIF_P->id) {
+    if (tb->common.owner != BIF_P->common.id) {
 	DeclareTmpHeap(meta_tuple,3,BIF_P);
 
 	/*
@@ -1671,10 +1674,12 @@ BIF_RETTYPE ets_delete_1(BIF_ALIST_1)
 			    make_small(tb->common.slot));
 
 	BIF_P->flags |= F_USING_DB;
-	tb->common.owner = BIF_P->id;
+	tb->common.owner = BIF_P->common.id;
 
 	db_put_hash(meta_pid_to_tab,
-		    TUPLE2(meta_tuple,BIF_P->id,make_small(tb->common.slot)),
+		    TUPLE2(meta_tuple,
+			   BIF_P->common.id,
+			   make_small(tb->common.slot)),
 		    0);
 	db_meta_unlock(meta_pid_to_tab, LCK_WRITE_REC);
 	UnUseTmpHeap(3,BIF_P);
@@ -1750,7 +1755,7 @@ BIF_RETTYPE ets_give_away_3(BIF_ALIST_3)
     }
 
     if ((tb = db_get_table(BIF_P, BIF_ARG_1, DB_WRITE, LCK_WRITE)) == NULL
-	|| tb->common.owner != BIF_P->id) {
+	|| tb->common.owner != BIF_P->common.id) {
 	goto badarg;
     }
     from_pid = tb->common.owner;
@@ -1773,7 +1778,10 @@ BIF_RETTYPE ets_give_away_3(BIF_ALIST_3)
 
     db_unlock(tb,LCK_WRITE);
     erts_send_message(BIF_P, to_proc, &to_locks,
-		      TUPLE4(buf, am_ETS_TRANSFER, tb->common.id, from_pid, BIF_ARG_3), 
+		      TUPLE4(buf, am_ETS_TRANSFER,
+			     tb->common.id,
+			     from_pid,
+			     BIF_ARG_3), 
 		      0);
     erts_smp_proc_unlock(to_proc, to_locks);
     UnUseTmpHeap(5,BIF_P);
@@ -1835,7 +1843,7 @@ BIF_RETTYPE ets_setopts_2(BIF_ALIST_2)
 
     if (tail != NIL
 	|| (tb = db_get_table(BIF_P, BIF_ARG_1, DB_WRITE, LCK_WRITE)) == NULL
-	|| tb->common.owner != BIF_P->id) {
+	|| tb->common.owner != BIF_P->common.id) {
 	goto badarg;
     }
 
@@ -2649,7 +2657,7 @@ BIF_RETTYPE ets_info_1(BIF_ALIST_1)
     */
 
     /* If/when we implement lockless private tables:
-    if ((tb->common.status & DB_PRIVATE) && owner != BIF_P->id) {
+    if ((tb->common.status & DB_PRIVATE) && owner != BIF_P->common.id) {
 	db_unlock(tb, LCK_READ);
 	rp = erts_pid2proc_not_running(BIF_P, ERTS_PROC_LOCK_MAIN,
 				       owner, ERTS_PROC_LOCK_MAIN);
@@ -3069,9 +3077,9 @@ static int give_away_to_heir(Process* p, DbTable* tb)
     Eterm to_pid;
     UWord heir_data;
 
-    ASSERT(tb->common.owner == p->id);
+    ASSERT(tb->common.owner == p->common.id);
     ASSERT(is_internal_pid(tb->common.heir));
-    ASSERT(tb->common.heir != p->id);
+    ASSERT(tb->common.heir != p->common.id);
 retry:
     to_pid = tb->common.heir;
     to_proc = erts_pid2proc_opt(p, ERTS_PROC_LOCK_MAIN,
@@ -3084,7 +3092,7 @@ retry:
 	db_lock(tb,LCK_WRITE);
 	ASSERT(tb != NULL);
     
-	if (tb->common.owner != p->id) {
+	if (tb->common.owner != p->common.id) {
 	    if (to_proc != NULL ) {
 		erts_smp_proc_unlock(to_proc, to_locks);
 	    }
@@ -3095,7 +3103,7 @@ retry:
 	    if (to_proc != NULL ) {
 		erts_smp_proc_unlock(to_proc, to_locks);
 	    }
-	    if (to_pid == p->id || to_pid == am_none) {
+	    if (to_pid == p->common.id || to_pid == am_none) {
 		return 0; /* no real heir, table still mine */
 	    }
 	    goto retry;
@@ -3104,7 +3112,8 @@ retry:
     if (to_proc == NULL) {
 	return 0; /* heir not alive, table still mine */
     }
-    if (to_proc->common.u.alive.started_interval != tb->common.heir_started_interval) {
+    if (to_proc->common.u.alive.started_interval
+	!= tb->common.heir_started_interval) {
 	erts_smp_proc_unlock(to_proc, to_locks);
 	return 0; /* heir dead and pid reused, table still mine */
     }
@@ -3129,7 +3138,11 @@ retry:
 	heir_data = tpv[1];
     }
     erts_send_message(p, to_proc, &to_locks,
-		      TUPLE4(buf, am_ETS_TRANSFER, tb->common.id, p->id, heir_data), 
+		      TUPLE4(buf,
+			     am_ETS_TRANSFER,
+			     tb->common.id,
+			     p->common.id,
+			     heir_data), 
 		      0);
     erts_smp_proc_unlock(to_proc, to_locks);
     return !0;
@@ -3149,7 +3162,7 @@ int
 erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 {
     ErtsDbProcCleanupState *state = (ErtsDbProcCleanupState *) c_p->u.terminate;
-    Eterm pid = c_p->id;
+    Eterm pid = c_p->common.id;
     ErtsDbProcCleanupState default_state;
     int ret;
 
@@ -3383,7 +3396,7 @@ static void fix_table_locked(Process* p, DbTable* tb)
     }
     else {
 	for (; fix != NULL; fix = fix->next) {
-	    if (fix->pid == p->id) {
+	    if (fix->pid == p->common.id) {
 		++(fix->counter);
 #ifdef ERTS_SMP
 		erts_smp_mtx_unlock(&tb->common.fixlock);
@@ -3395,7 +3408,7 @@ static void fix_table_locked(Process* p, DbTable* tb)
     fix = (DbFixation *) erts_db_alloc(ERTS_ALC_T_DB_FIXATION,
 				       tb, sizeof(DbFixation));
     ERTS_ETS_MISC_MEM_ADD(sizeof(DbFixation));
-    fix->pid = p->id;
+    fix->pid = p->common.id;
     fix->counter = 1;
     fix->next = tb->common.fixations;
     tb->common.fixations = fix;
@@ -3406,7 +3419,9 @@ static void fix_table_locked(Process* p, DbTable* tb)
     UseTmpHeap(3,p);
     db_meta_lock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
     if (db_put_hash(meta_pid_to_fixed_tab,
-		    TUPLE2(meta_tuple, p->id, make_small(tb->common.slot)),
+		    TUPLE2(meta_tuple,
+			   p->common.id,
+			   make_small(tb->common.slot)),
 		    0) != DB_ERROR_NONE) {
 	UnUseTmpHeap(3,p);
 	erl_exit(1,"Could not insert ets metadata in safe_fixtable.");
@@ -3426,7 +3441,7 @@ static void unfix_table_locked(Process* p,  DbTable* tb,
     erts_smp_mtx_lock(&tb->common.fixlock);
 #endif
     for (pp = &tb->common.fixations; *pp != NULL; pp = &(*pp)->next) {
-	if ((*pp)->pid == p->id) {
+	if ((*pp)->pid == p->common.id) {
 	    DbFixation* fix = *pp;
 	    erts_refc_dec(&tb->common.ref,0);
 	    --(fix->counter);
@@ -3440,7 +3455,7 @@ static void unfix_table_locked(Process* p,  DbTable* tb,
 #endif
 	    db_meta_lock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
 	    db_erase_bag_exact2(meta_pid_to_fixed_tab,
-				p->id, make_small(tb->common.slot));
+				p->common.id, make_small(tb->common.slot));
 	    db_meta_unlock(meta_pid_to_fixed_tab, LCK_WRITE_REC);
 	    erts_db_free(ERTS_ALC_T_DB_FIXATION,
 			 tb, (void *) fix, sizeof(DbFixation));
@@ -3499,7 +3514,7 @@ static void set_heir(Process* me, DbTable* tb, Eterm heir, UWord heir_data)
     if (heir == am_none) {
 	return;
     }
-    if (heir == me->id) {
+    if (heir == me->common.id) {
 	erts_ensure_later_proc_interval(me->common.u.alive.started_interval);
 	tb->common.heir_started_interval = me->common.u.alive.started_interval;
     }
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index 25d22f713b..d89190e3c1 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -2178,7 +2178,7 @@ restart:
 	    pc += n;
 	    break;
 	case matchSelf:
-	    *esp++ = c_p->id;
+	    *esp++ = c_p->common.id;
 	    break;
 	case matchWaste:
 	    --esp;
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index dcecc4251a..d8f6e40d2e 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -320,10 +320,10 @@ ERTS_GLB_INLINE int db_eq(DbTableCommon* tb, Eterm a, DbTerm* b)
 #define DB_INFO  (DB_PROTECTED|DB_PUBLIC|DB_PRIVATE)
 
 #define ONLY_WRITER(P,T) (((T)->common.status & (DB_PRIVATE|DB_PROTECTED)) \
-			  && (T)->common.owner == (P)->id)
+			  && (T)->common.owner == (P)->common.id)
 
 #define ONLY_READER(P,T) (((T)->common.status & DB_PRIVATE) && \
-(T)->common.owner == (P)->id)
+(T)->common.owner == (P)->common.id)
 
 /* Function prototypes */
 BIF_RETTYPE db_get_trace_control_word(Process* p);
diff --git a/erts/emulator/beam/erl_debug.c b/erts/emulator/beam/erl_debug.c
index d7d6fcf0a2..783555195f 100644
--- a/erts/emulator/beam/erl_debug.c
+++ b/erts/emulator/beam/erl_debug.c
@@ -285,16 +285,16 @@ void erts_check_stack(Process *p)
     if (p->stop > stack_start)
 	erl_exit(1,
 		 "<%lu.%lu.%lu>: Stack underflow\n",
-		 internal_pid_channel_no(p->id),
-		 internal_pid_number(p->id),
-		 internal_pid_serial(p->id));
+		 internal_pid_channel_no(p->common.id),
+		 internal_pid_number(p->common.id),
+		 internal_pid_serial(p->common.id));
 
     if (p->stop < stack_end)
 	erl_exit(1,
 		 "<%lu.%lu.%lu>: Stack overflow\n",
-		 internal_pid_channel_no(p->id),
-		 internal_pid_number(p->id),
-		 internal_pid_serial(p->id));
+		 internal_pid_channel_no(p->common.id),
+		 internal_pid_number(p->common.id),
+		 internal_pid_serial(p->common.id));
 
     for (elemp = p->stop; elemp < stack_start; elemp++) {
 	int in_mbuf = 0;
@@ -317,9 +317,9 @@ void erts_check_stack(Process *p)
 
 	erl_exit(1,
 		 "<%lu.%lu.%lu>: Wild stack pointer\n",
-		 internal_pid_channel_no(p->id),
-		 internal_pid_number(p->id),
-		 internal_pid_serial(p->id));
+		 internal_pid_channel_no(p->common.id),
+		 internal_pid_number(p->common.id),
+		 internal_pid_serial(p->common.id));
     }
 
 }
@@ -420,16 +420,16 @@ void verify_process(Process *p)
 #define VERIFY_AREA(name,ptr,sz) {                                      \
     int n = (sz);							\
     while (n--) if(!verify_eterm(p,*(ptr+n)))				\
-        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->id); }
+        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); }
 
 #define VERIFY_ETERM(name,eterm) {                                      \
     if(!verify_eterm(p,eterm))                                          \
-        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->id); }
+        erl_exit(1,"Wild pointer found in " name " of %T!\n",p->common.id); }
 
 
     ErlMessage* mp = p->msg.first;
 
-    VERBOSE(DEBUG_MEMORY,("Verify process: %T...\n",p->id));
+    VERBOSE(DEBUG_MEMORY,("Verify process: %T...\n",p->common.id));
 
     while (mp != NULL) {
         VERIFY_ETERM("message term",ERL_MESSAGE_TERM(mp));
@@ -665,7 +665,7 @@ static void print_process_memory(Process *p)
     ErlHeapFragment* bp = MBUF(p);
 
     erts_printf("==============================\n");
-    erts_printf("|| Memory info for %T ||\n",p->id);
+    erts_printf("|| Memory info for %T ||\n",p->common.id);
     erts_printf("==============================\n");
 
     erts_printf("-- %-*s ---%s-%s-%s-%s--\n",
@@ -849,7 +849,7 @@ void print_memory_info(Process *p)
 {
     if (p != NULL) {
         erts_printf("======================================\n");
-        erts_printf("|| Memory info for %-12T ||\n",p->id);
+        erts_printf("|| Memory info for %-12T ||\n",p->common.id);
         erts_printf("======================================\n");
         erts_printf("+- local heap ----%s-%s-%s-%s-+\n",
                     dashes,dashes,dashes,dashes);
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index d694ce954e..8a0e314e71 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -59,7 +59,7 @@ static Uint reclaimed;			/* no of words reclaimed in GCs */
         erts_fprintf(stderr, "htop=%p\n", (p)->htop); \
         erts_fprintf(stderr, "heap=%p\n", (p)->heap); \
         erl_exit(ERTS_ABORT_EXIT, "%s, line %d: %T: Overrun stack and heap\n", \
-		 __FILE__,__LINE__,(P)->id); \
+		 __FILE__,__LINE__,(P)->common.id); \
     }
 
 #ifdef DEBUG
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 64065bafb8..92af3f2ac4 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -929,8 +929,8 @@ erts_send_message(Process* sender,
  #ifdef USE_VM_PROBES
     *sender_name = *receiver_name = '\0';
    if (DTRACE_ENABLED(message_send)) {
-        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->id);
-        erts_snprintf(receiver_name, sizeof(receiver_name), "%T", receiver->id);
+        erts_snprintf(sender_name, sizeof(sender_name), "%T", sender->common.id);
+        erts_snprintf(receiver_name, sizeof(receiver_name), "%T", receiver->common.id);
     }
 #endif
     if (SEQ_TRACE_TOKEN(sender) != NIL && !(flags & ERTS_SND_FLG_NO_SEQ_TRACE)) {
@@ -952,7 +952,7 @@ erts_send_message(Process* sender,
 
 	    seq_trace_update_send(sender);
 	    seq_trace_output(stoken, message, SEQ_TRACE_SEND, 
-			     receiver->id, sender);
+			     receiver->common.id, sender);
 	    seq_trace_size = 6; /* TUPLE5 */
 #ifdef USE_VM_PROBES
 	}
@@ -983,7 +983,7 @@ erts_send_message(Process* sender,
 #ifdef DTRACE_TAG_HARDDEBUG
 	    erts_fprintf(stderr,
 			 "Dtrace -> (%T) Spreading tag (%T) with "
-			 "message %T!\r\n",sender->id, utag, message);
+			 "message %T!\r\n",sender->common.id, utag, message);
 #endif
 	}
 #endif
@@ -1220,7 +1220,7 @@ erts_deliver_exit_message(Eterm from, Process *to, ErtsProcLocks *to_locksp,
 	save = TUPLE3(hp, am_EXIT, from_copy, mess);
 	hp += 4;
 	/* the trace token must in this case be updated by the caller */
-	seq_trace_output(token, save, SEQ_TRACE_SEND, to->id, NULL);
+	seq_trace_output(token, save, SEQ_TRACE_SEND, to->common.id, NULL);
 	temptoken = copy_struct(token, sz_token, &hp, &bp->off_heap);
 	erts_queue_message(to, to_locksp, bp, save, temptoken
 #ifdef USE_VM_PROBES
diff --git a/erts/emulator/beam/erl_monitors.c b/erts/emulator/beam/erl_monitors.c
index 1a84950120..450aad975d 100644
--- a/erts/emulator/beam/erl_monitors.c
+++ b/erts/emulator/beam/erl_monitors.c
@@ -971,7 +971,7 @@ Eterm erts_debug_dump_monitors_1(BIF_ALIST_1)
 	}
     } else {
 	erts_printf("Dumping pid monitors--------------------\n");
-	erts_dump_monitors(rp->monitors,0);
+	erts_dump_monitors(ERTS_P_MONITORS(rp),0);
 	erts_printf("Monitors dumped-------------------------\n");
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	BIF_RET(am_true);
@@ -988,7 +988,7 @@ Eterm erts_debug_dump_links_1(BIF_ALIST_1)
 	Port *rport = erts_id2port(pid, p, ERTS_PROC_LOCK_MAIN);
 	if (rport) {
 	    erts_printf("Dumping port links----------------------\n");
-	    erts_dump_links(rport->nlinks,0);
+	    erts_dump_links(ERTS_P_LINKS(rport), 0);
 	    erts_printf("Links dumped----------------------------\n");
 	    erts_smp_port_unlock(rport);
 	    BIF_RET(am_true);
@@ -1014,7 +1014,7 @@ Eterm erts_debug_dump_links_1(BIF_ALIST_1)
 
 	} else {
 	    erts_printf("Dumping pid links-----------------------\n");
-	    erts_dump_links(rp->nlinks,0);
+	    erts_dump_links(ERTS_P_LINKS(rp), 0);
 	    erts_printf("Links dumped----------------------------\n");
 	    erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	    BIF_RET(am_true);
diff --git a/erts/emulator/beam/erl_monitors.h b/erts/emulator/beam/erl_monitors.h
index d3f6d410dd..a7fa4e0145 100644
--- a/erts/emulator/beam/erl_monitors.h
+++ b/erts/emulator/beam/erl_monitors.h
@@ -137,8 +137,6 @@ typedef struct erts_suspend_monitor {
 #define ERTS_LINK_ROOT(Linkp) ((Linkp)->shared.root)
 #define ERTS_LINK_REFC(Linkp) ((Linkp)->shared.refc) 
 
-#define ERTS_LINK_ROOT_AS_UINT(Linkp) (*((Uint *) &((Linkp)->root)))
-
 Uint erts_tot_link_lh_size(void);
 
 
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 6d0975f41f..8ef6e8f846 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -259,7 +259,7 @@ ErlNifEnv* enif_alloc_env(void)
     HEAP_LIMIT(&msg_env->phony_proc) = phony_heap;
     HEAP_END(&msg_env->phony_proc) = phony_heap;
     MBUF(&msg_env->phony_proc) = NULL;
-    msg_env->phony_proc.id = ERTS_INVALID_PID;
+    msg_env->phony_proc.common.id = ERTS_INVALID_PID;
 #ifdef FORCE_HEAP_FRAGS
     msg_env->phony_proc.space_verified = 0;
     msg_env->phony_proc.space_verified_from = NULL;
@@ -283,7 +283,7 @@ void enif_clear_env(ErlNifEnv* env)
     struct enif_msg_environment_t* menv = (struct enif_msg_environment_t*)env;
     Process* p = &menv->phony_proc;
     ASSERT(p == menv->env.proc);
-    ASSERT(p->id == ERTS_INVALID_PID);
+    ASSERT(p->common.id == ERTS_INVALID_PID);
     ASSERT(MBUF(p) == menv->env.heap_frag);
     if (MBUF(p) != NULL) {
 	erts_cleanup_offheap(&MSO(p));
@@ -315,7 +315,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
 
     if (env != NULL) {
 	c_p = env->proc;
-	if (receiver == c_p->id) {
+	if (receiver == c_p->common.id) {
 	    rp_locks = ERTS_PROC_LOCK_MAIN;
 	    flush_me = 1;
 	}
@@ -337,7 +337,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
 	  : erts_pid2proc_opt(c_p, ERTS_PROC_LOCK_MAIN,
 			      receiver, rp_locks, ERTS_P2P_FLG_SMP_INC_REFC));
     if (rp == NULL) {
-	ASSERT(env == NULL || receiver != c_p->id);
+	ASSERT(env == NULL || receiver != c_p->common.id);
 	return 0;
     }
     flush_env(msg_env);
@@ -393,7 +393,7 @@ static int is_offheap(const ErlOffHeap* oh)
 
 ErlNifPid* enif_self(ErlNifEnv* caller_env, ErlNifPid* pid)
 {
-    pid->pid = caller_env->proc->id;
+    pid->pid = caller_env->proc->common.id;
     return pid;
 }
 int enif_get_local_pid(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPid* pid)
@@ -1793,7 +1793,7 @@ void erl_nif_init()
 #ifdef USE_VM_PROBES
 void dtrace_nifenv_str(ErlNifEnv *env, char *process_buf)
 {
-    dtrace_pid_str(env->proc->id, process_buf);
+    dtrace_pid_str(env->proc->common.id, process_buf);
 }
 #endif
 
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index f64a7fa41a..3b400ce0de 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -1319,12 +1319,12 @@ setup_reference_table(void)
 	    /* Insert Heap */
 	    insert_offheap(&(proc->off_heap),
 			   HEAP_REF,
-			   proc->id);
+			   proc->common.id);
 	    /* Insert message buffers */
 	    for(hfp = proc->mbuf; hfp; hfp = hfp->next)
 		insert_offheap(&(hfp->off_heap),
 			       HEAP_REF,
-			       proc->id);
+			       proc->common.id);
 	    /* Insert msg msg buffers */
 	    for (msg = proc->msg.first; msg; msg = msg->next) {
 		ErlHeapFragment *heap_frag = NULL;
@@ -1334,7 +1334,7 @@ setup_reference_table(void)
 		    else {
 			if (msg->data.dist_ext->dep)
 			    insert_dist_entry(msg->data.dist_ext->dep,
-					      HEAP_REF, proc->id, 0);
+					      HEAP_REF, proc->common.id, 0);
 			if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
 			    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
 		    }
@@ -1342,7 +1342,7 @@ setup_reference_table(void)
 		if (heap_frag)
 		    insert_offheap(&(heap_frag->off_heap),
 				   HEAP_REF,
-				   proc->id);
+				   proc->common.id);
 	    }
 #ifdef ERTS_SMP
 	    for (msg = proc->msg_inq.first; msg; msg = msg->next) {
@@ -1353,7 +1353,7 @@ setup_reference_table(void)
 		    else {
 			if (msg->data.dist_ext->dep)
 			    insert_dist_entry(msg->data.dist_ext->dep,
-					      HEAP_REF, proc->id, 0);
+					      HEAP_REF, proc->common.id, 0);
 			if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
 			    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
 		    }
@@ -1361,19 +1361,19 @@ setup_reference_table(void)
 		if (heap_frag)
 		    insert_offheap(&(heap_frag->off_heap),
 				   HEAP_REF,
-				   proc->id);
+				   proc->common.id);
 	    }
 #endif
 	    /* Insert links */
-	    if(proc->nlinks)
-		insert_links(proc->nlinks, proc->id);
-	    if(proc->monitors)
-		insert_monitors(proc->monitors, proc->id);
+	    if (ERTS_P_LINKS(proc))
+		insert_links(ERTS_P_LINKS(proc), proc->common.id);
+	    if (ERTS_P_MONITORS(proc))
+		insert_monitors(ERTS_P_MONITORS(proc), proc->common.id);
 	    /* Insert controller */
 	    {
 		DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(proc);
 		if (dep)
-		    insert_dist_entry(dep, CTRL_REF, proc->id, 0);
+		    insert_dist_entry(dep, CTRL_REF, proc->common.id, 0);
 	    }
 	}
     }
@@ -1389,16 +1389,19 @@ setup_reference_table(void)
 	    continue;
 
 	/* Insert links */
-	if(erts_port[i].nlinks)
-	    insert_links(erts_port[i].nlinks, erts_port[i].id);
+	if (ERTS_P_LINKS(&erts_port[i]))
+	    insert_links(ERTS_P_LINKS(&erts_port[i]), erts_port[i].common.id);
+	/* Insert monitors */
+	if (ERTS_P_MONITORS(&erts_port[i]))
+	    insert_monitors(ERTS_P_MONITORS(&erts_port[i]), erts_port[i].common.id);
 	/* Insert port data */
 	for(hfp = erts_port[i].bp; hfp; hfp = hfp->next)
-	    insert_offheap(&(hfp->off_heap), HEAP_REF, erts_port[i].id);
+	    insert_offheap(&(hfp->off_heap), HEAP_REF, erts_port[i].common.id);
 	/* Insert controller */
 	if (erts_port[i].dist_entry)
 	    insert_dist_entry(erts_port[i].dist_entry,
 			      CTRL_REF,
-			      erts_port[i].id,
+			      erts_port[i].common.id,
 			      0);
     }
 
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
new file mode 100644
index 0000000000..1a5bc636e2
--- /dev/null
+++ b/erts/emulator/beam/erl_port.h
@@ -0,0 +1,503 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2012. All Rights Reserved.
+ *
+ * The contents of this file are subject to the Erlang Public License,
+ * Version 1.1, (the "License"); you may not use this file except in
+ * compliance with the License. You should have received a copy of the
+ * Erlang Public License along with this software. If not, it can be
+ * retrieved online at http://www.erlang.org/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * %CopyrightEnd%
+ */
+
+#ifndef ERL_PORT_H__
+#define ERL_PORT_H__
+
+typedef struct port Port;
+#include "erl_port_task.h"
+#include "erl_ptab.h"
+
+typedef struct erts_driver_t_ erts_driver_t;
+
+#define SMALL_IO_QUEUE 5   /* Number of fixed elements */
+
+typedef struct {
+    ErlDrvSizeT size;       /* total size in bytes */
+
+    SysIOVec* v_start;
+    SysIOVec* v_end;
+    SysIOVec* v_head;
+    SysIOVec* v_tail;
+    SysIOVec  v_small[SMALL_IO_QUEUE];
+
+    ErlDrvBinary** b_start;
+    ErlDrvBinary** b_end;
+    ErlDrvBinary** b_head;
+    ErlDrvBinary** b_tail;
+    ErlDrvBinary*  b_small[SMALL_IO_QUEUE];
+} ErlIOQueue;
+
+typedef struct line_buf {  /* Buffer used in line oriented I/O */
+    ErlDrvSizeT bufsiz;      /* Size of character buffer */
+    ErlDrvSizeT ovlen;       /* Length of overflow data */
+    ErlDrvSizeT ovsiz;       /* Actual size of overflow buffer */
+    char data[1];            /* Starting point of buffer data,
+			      data[0] is a flag indicating an unprocess CR,
+			      The rest is the overflow buffer. */
+} LineBuf;
+
+
+/*
+ * Port Specific Data.
+ *
+ * Only use PrtSD for very rarely used data.
+ */
+
+#define ERTS_PRTSD_SCHED_ID 0
+
+#define ERTS_PRTSD_SIZE 1
+
+typedef struct {
+    void *data[ERTS_PRTSD_SIZE];
+} ErtsPrtSD;
+
+#ifdef ERTS_SMP
+typedef struct ErtsXPortsList_ ErtsXPortsList;
+#endif
+
+/*
+ * Port locking:
+ *
+ * Locking is done either driver specific or port specific. When
+ * driver specific locking is used, all instances of the driver,
+ * i.e. ports running the driver, share the same lock. When port
+ * specific locking is used each instance have its own lock.
+ *
+ * Most fields in the Port structure are protected by the lock
+ * referred to by the 'lock' field. This lock is shared between
+ * all ports running the same driver when driver specific locking
+ * is used.
+ *
+ * The 'sched' field is protected by the run queue lock that the
+ * port currently is assigned to.
+ *
+ */
+
+struct port {
+    ErtsPTabElementCommon common; /* *Need* to be first in struct */
+
+    ErtsPortTaskSched sched;
+    ErtsPortTaskHandle timeout_task;
+#ifdef ERTS_SMP
+    erts_smp_mtx_t *lock;
+    ErtsXPortsList *xports;
+    erts_smp_atomic_t run_queue;
+    erts_smp_spinlock_t state_lck;  /* protects: id, status, snapshot */
+#endif
+    Eterm connected;            /* A connected process */
+    Eterm caller;		/* Current caller. */
+    Eterm data;			/* Data associated with port. */
+    ErlHeapFragment* bp;	/* Heap fragment holding data (NULL if imm data). */
+    Uint bytes_in;		/* Number of bytes read */
+    Uint bytes_out;		/* Number of bytes written */
+
+    ErlIOQueue ioq;              /* driver accessible i/o queue */
+    DistEntry *dist_entry;       /* Dist entry used in DISTRIBUTION */
+    char *name;		         /* String used in the open */
+    erts_driver_t* drv_ptr;
+    UWord drv_data;
+    ErtsProcList *suspended;	 /* List of suspended processes. */
+    LineBuf *linebuf;            /* Buffer to hold data not ready for
+				    process to get (line oriented I/O)*/
+    erts_smp_atomic32_t state;	 /* Status and type flags */
+    int control_flags;		 /* Flags for port_control()  */
+    erts_aint32_t snapshot;      /* Next snapshot that port should be part of */
+    ErlDrvPDL port_data_lock;
+
+    ErtsPrtSD *psd;		 /* Port specific data */
+};
+
+
+ERTS_GLB_INLINE ErtsRunQueue *erts_port_runq(Port *prt);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE ErtsRunQueue *
+erts_port_runq(Port *prt)
+{
+#ifdef ERTS_SMP
+    ErtsRunQueue *rq1, *rq2;
+    rq1 = (ErtsRunQueue *) erts_smp_atomic_read_nob(&prt->run_queue);
+    if (!rq1)
+	return NULL;
+    while (1) {
+	erts_smp_runq_lock(rq1);
+	rq2 = (ErtsRunQueue *) erts_smp_atomic_read_nob(&prt->run_queue);
+	if (rq1 == rq2)
+	    return rq1;
+	erts_smp_runq_unlock(rq1);
+	rq1 = rq2;
+	if (!rq1)
+	    return NULL;
+    }
+#else
+    return ERTS_RUNQ_IX(0);
+#endif
+}
+
+#endif
+
+
+ERTS_GLB_INLINE void *erts_prtsd_get(Port *p, int ix);
+ERTS_GLB_INLINE void *erts_prtsd_set(Port *p, int ix, void *new);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE void *
+erts_prtsd_get(Port *prt, int ix)
+{
+    return prt->psd ? prt->psd->data[ix] : NULL;
+}
+
+ERTS_GLB_INLINE void *
+erts_prtsd_set(Port *prt, int ix, void *data)
+{
+    if (prt->psd) {
+	void *old = prt->psd->data[ix];
+	prt->psd->data[ix] = data;
+	return old;
+    }
+    else {
+	prt->psd = erts_alloc(ERTS_ALC_T_PRTSD, sizeof(ErtsPrtSD));
+	prt->psd->data[ix] = data;
+	return NULL;
+    }
+}
+
+#endif
+
+/* arrays that get malloced at startup */
+extern Port* erts_port;
+
+extern Uint erts_max_ports;
+extern Uint erts_port_tab_index_mask;
+extern erts_smp_atomic32_t erts_ports_snapshot;
+extern erts_smp_atomic_t erts_dead_ports_ptr;
+
+ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt)
+{
+    ERTS_SMP_LC_ASSERT(erts_smp_lc_spinlock_is_locked(&prt->state_lck));
+    if (prt->snapshot != erts_smp_atomic32_read_acqb(&erts_ports_snapshot)) {
+	/* Dead ports are added from the end of the snapshot buffer */
+	Eterm* tombstone;
+	tombstone = (Eterm*) erts_smp_atomic_add_read_nob(&erts_dead_ports_ptr,
+							  -(erts_aint_t)sizeof(Eterm));
+	ASSERT(tombstone+1 != NULL);
+	ASSERT(prt->snapshot == erts_smp_atomic32_read_nob(&erts_ports_snapshot) - 1);
+	*tombstone = prt->common.id;
+    }
+    /*else no ongoing snapshot or port was already included or created after snapshot */
+}
+
+#endif
+
+extern erts_smp_atomic_t erts_bytes_out;	/* no bytes written out */
+extern erts_smp_atomic_t erts_bytes_in;		/* no bytes sent into the system */
+
+
+/* port status flags */
+
+#define ERTS_PORT_SFLG_CONNECTED	((Uint32) (1 <<  0))
+/* Port have begun exiting */
+#define ERTS_PORT_SFLG_EXITING		((Uint32) (1 <<  1))
+/* Distribution port */
+#define ERTS_PORT_SFLG_DISTRIBUTION	((Uint32) (1 <<  2))
+#define ERTS_PORT_SFLG_BINARY_IO	((Uint32) (1 <<  3))
+#define ERTS_PORT_SFLG_SOFT_EOF		((Uint32) (1 <<  4))
+/* Flow control */
+#define ERTS_PORT_SFLG_PORT_BUSY	((Uint32) (1 <<  5))
+/* Port is closing (no i/o accepted) */
+#define ERTS_PORT_SFLG_CLOSING		((Uint32) (1 <<  6))
+/* Send a closed message when terminating */
+#define ERTS_PORT_SFLG_SEND_CLOSED	((Uint32) (1 <<  7))
+/* Line orinted io on port */  
+#define ERTS_PORT_SFLG_LINEBUF_IO	((Uint32) (1 <<  8))
+/* Immortal port (only certain system ports) */
+#define ERTS_PORT_SFLG_IMMORTAL		((Uint32) (1 <<  9))
+#define ERTS_PORT_SFLG_FREE		((Uint32) (1 << 10))
+#define ERTS_PORT_SFLG_FREE_SCHEDULED	((Uint32) (1 << 11))
+#define ERTS_PORT_SFLG_INITIALIZING	((Uint32) (1 << 12))
+/* Port uses port specific locking (opposed to driver specific locking) */
+#define ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK ((Uint32) (1 << 13))
+#define ERTS_PORT_SFLG_INVALID		((Uint32) (1 << 14))
+/* Last port to terminate halts the emulator */
+#define ERTS_PORT_SFLG_HALT		((Uint32) (1 << 15))
+#ifdef DEBUG
+/* Only debug: make sure all flags aren't cleared unintentionally */
+#define ERTS_PORT_SFLG_PORT_DEBUG	((Uint32) (1 << 31))
+#endif
+
+/* Combinations of port status flags */ 
+#define ERTS_PORT_SFLGS_DEAD						\
+  (ERTS_PORT_SFLG_FREE							\
+   | ERTS_PORT_SFLG_FREE_SCHEDULED					\
+   | ERTS_PORT_SFLG_INITIALIZING)
+#define ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP				\
+  (ERTS_PORT_SFLGS_DEAD | ERTS_PORT_SFLG_INVALID)
+#define ERTS_PORT_SFLGS_INVALID_LOOKUP					\
+  (ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP				\
+   | ERTS_PORT_SFLG_CLOSING)
+#define ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP				\
+  (ERTS_PORT_SFLGS_INVALID_LOOKUP					\
+   | ERTS_PORT_SFLG_PORT_BUSY						\
+   | ERTS_PORT_SFLG_DISTRIBUTION)
+
+
+void erts_port_cleanup(Port *);
+void erts_fire_port_monitor(Port *prt, Eterm ref);
+#ifdef ERTS_SMP
+void erts_smp_xports_unlock(Port *);
+#endif
+
+#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
+int erts_lc_is_port_locked(Port *);
+#endif
+
+ERTS_GLB_INLINE void erts_smp_port_minor_lock(Port*);
+ERTS_GLB_INLINE void erts_smp_port_minor_unlock(Port*);
+
+ERTS_GLB_INLINE int erts_smp_port_trylock(Port *prt);
+ERTS_GLB_INLINE void erts_smp_port_lock(Port *prt);
+ERTS_GLB_INLINE void erts_smp_port_unlock(Port *prt);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE void
+erts_smp_port_minor_lock(Port* prt)
+{
+#ifdef ERTS_SMP
+    erts_smp_spin_lock(&prt->state_lck);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_port_minor_unlock(Port *prt)
+{
+#ifdef ERTS_SMP
+    erts_smp_spin_unlock(&prt->state_lck);
+#endif
+}
+
+
+ERTS_GLB_INLINE int
+erts_smp_port_trylock(Port *prt)
+{
+    int res;
+
+    ASSERT(erts_smp_atomic32_read_nob(&prt->common.refc) > 0);
+    erts_smp_atomic32_inc_nob(&prt->common.refc);
+
+#ifdef ERTS_SMP
+    res = erts_smp_mtx_trylock(prt->lock);
+    if (res == EBUSY) {
+	erts_smp_atomic32_dec_nob(&prt->common.refc);
+    }
+#else
+    res = 0;
+#endif
+
+    return res;
+}
+
+ERTS_GLB_INLINE void
+erts_smp_port_lock(Port *prt)
+{
+    ASSERT(erts_smp_atomic32_read_nob(&prt->common.refc) > 0);
+    erts_smp_atomic32_inc_nob(&prt->common.refc);
+#ifdef ERTS_SMP
+    erts_smp_mtx_lock(prt->lock);
+#endif
+}
+
+ERTS_GLB_INLINE void
+erts_smp_port_unlock(Port *prt)
+{
+    erts_aint32_t refc;
+#ifdef ERTS_SMP
+    erts_smp_mtx_unlock(prt->lock);
+#endif
+    refc = erts_smp_atomic32_dec_read_nob(&prt->common.refc);
+    ASSERT(refc >= 0);
+    if (refc == 0)
+	erts_port_cleanup(prt);
+}
+
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+
+#define ERTS_INVALID_PORT_OPT(PP, ID, FLGS)			\
+    (!(PP)							\
+     || (erts_smp_atomic32_read_nob(&(PP)->state) & (FLGS))	\
+     || (PP)->common.id != (ID))
+
+/* port lookup */
+
+#define INVALID_PORT(PP, ID) \
+  ERTS_INVALID_PORT_OPT((PP), (ID), ERTS_PORT_SFLGS_INVALID_LOOKUP)
+
+/* Invalidate trace port if anything suspicious, for instance
+ * that the port is a distribution port or it is busy.
+ */
+#define INVALID_TRACER_PORT(PP, ID)					\
+  ERTS_INVALID_PORT_OPT((PP), (ID), ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP)
+
+#define ERTS_PORT_SCHED_ID(P, ID) \
+  ((Uint) (UWord) erts_prtsd_set((P), ERTS_PSD_SCHED_ID, (void *) (UWord) (ID)))
+
+#ifdef ERTS_SMP
+Port *erts_de2port(DistEntry *, Process *, ErtsProcLocks);
+#endif
+
+#define erts_id2port(ID, P, PL) \
+  erts_id2port_sflgs((ID), (P), (PL), ERTS_PORT_SFLGS_INVALID_LOOKUP)
+
+ERTS_GLB_INLINE Port*erts_id2port_sflgs(Eterm, Process *, ErtsProcLocks, Uint32);
+ERTS_GLB_INLINE void erts_port_release(Port *);
+ERTS_GLB_INLINE Port*erts_drvport2port(ErlDrvPort, erts_aint32_t *);
+ERTS_GLB_INLINE Port*erts_drvportid2port(Eterm);
+ERTS_GLB_INLINE Uint32 erts_portid2status(Eterm id);
+ERTS_GLB_INLINE int erts_is_port_alive(Eterm id);
+ERTS_GLB_INLINE int erts_is_valid_tracer_port(Eterm id);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE Port*
+erts_id2port_sflgs(Eterm id, Process *c_p, ErtsProcLocks c_p_locks, Uint32 sflgs)
+{
+#ifdef ERTS_SMP
+    int no_proc_locks = !c_p || !c_p_locks;
+#endif
+    Port *prt;
+
+    if (is_not_internal_port(id))
+	return NULL;
+
+    prt = &erts_port[internal_port_index(id)];
+
+    erts_smp_port_minor_lock(prt);
+    if (ERTS_INVALID_PORT_OPT(prt, id, sflgs)) {
+	erts_smp_port_minor_unlock(prt);
+	prt = NULL;
+    }
+    else {
+	erts_smp_atomic32_inc_nob(&prt->common.refc);
+	erts_smp_port_minor_unlock(prt);
+
+#ifdef ERTS_SMP
+ 	if (no_proc_locks)
+	    erts_smp_mtx_lock(prt->lock);
+	else if (erts_smp_mtx_trylock(prt->lock) == EBUSY) {
+	    /* Unlock process locks, and acquire locks in lock order... */
+	    erts_smp_proc_unlock(c_p, c_p_locks);
+	    erts_smp_mtx_lock(prt->lock);
+	    erts_smp_proc_lock(c_p, c_p_locks);
+	}
+
+	/* The id may not have changed... */
+	ERTS_SMP_LC_ASSERT(prt->common.id == id);
+	/* ... but state may have... */
+	if (erts_smp_atomic32_read_nob(&prt->state) & sflgs) {
+	    erts_smp_port_unlock(prt); /* Also decrements common.refc... */
+	    prt = NULL;
+	}
+#endif
+
+    }
+
+    return prt;
+}
+
+ERTS_GLB_INLINE void
+erts_port_release(Port *prt)
+{
+    erts_smp_port_unlock(prt);
+}
+
+ERTS_GLB_INLINE Port*
+erts_drvport2port(ErlDrvPort drvport, erts_aint32_t *statep)
+{
+    int ix = (int) drvport;
+    erts_aint32_t state;
+    if (ix < 0 || erts_max_ports <= ix)
+	return NULL;
+    state = erts_smp_atomic32_read_nob(&erts_port[ix].state);
+    if (state & ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP)
+	return NULL;
+    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(&erts_port[ix]));
+    if (statep)
+	*statep = state;
+    return &erts_port[ix];
+}
+
+ERTS_GLB_INLINE Port*
+erts_drvportid2port(Eterm id)
+{
+    int ix;
+    erts_aint32_t state;
+    if (is_not_internal_port(id))
+	return NULL;
+    ix = (int) internal_port_index(id);
+    if (erts_max_ports <= ix)
+	return NULL;
+    state = erts_smp_atomic32_read_nob(&erts_port[ix].state);
+    if (state & ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP)
+	return NULL;
+    if (erts_port[ix].common.id != id)
+	return NULL;
+    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(&erts_port[ix]));
+    return &erts_port[ix];
+}
+
+ERTS_GLB_INLINE Uint32
+erts_portid2status(Eterm id)
+{
+    if (is_not_internal_port(id))
+	return ERTS_PORT_SFLG_INVALID;
+    else {
+	erts_aint32_t state;
+	int ix = internal_port_index(id);
+	if (erts_max_ports <= ix)
+	    return ERTS_PORT_SFLG_INVALID;
+	state = erts_smp_atomic32_read_ddrb(&erts_port[ix].state);
+	if (erts_port[ix].common.id != id)
+	    return ERTS_PORT_SFLG_INVALID;
+	return state;
+    }
+}
+
+ERTS_GLB_INLINE int
+erts_is_port_alive(Eterm id)
+{
+    return !(erts_portid2status(id) & (ERTS_PORT_SFLG_INVALID
+				       | ERTS_PORT_SFLGS_DEAD));
+}
+
+ERTS_GLB_INLINE int
+erts_is_valid_tracer_port(Eterm id)
+{
+    return !(erts_portid2status(id) & ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP);
+}
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+#endif
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 3873dd8f99..6eb8c4869c 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -52,7 +52,7 @@
 
 #define ERTS_PORT_TASK_INVALID_PORT(P, ID) \
   ((erts_smp_atomic32_read_acqb(&(P)->state) & ERTS_PORT_SFLGS_DEAD) \
-   || (P)->id != (ID))
+   || (P)->common.id != (ID))
 
 #define ERTS_PORT_IS_IN_RUNQ(RQ, P) \
   ((P)->sched.next || (P)->sched.prev || (RQ)->ports.start == (P))
@@ -634,7 +634,7 @@ erts_port_task_free_port(Port *pp)
 					 ERTS_PORT_SFLG_FREE_SCHEDULED);
 	erts_may_save_closed_port(pp);
 	erts_smp_port_minor_unlock(pp);
-	ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&pp->refc) > 1);
+	ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&pp->common.refc) > 1);
 	ptp->type = ERTS_PORT_TASK_FREE;
 	ptp->event = (ErlDrvEvent) -1;
 	ptp->event_data = NULL;
@@ -658,8 +658,8 @@ erts_port_task_free_port(Port *pp)
 					 ERTS_PORT_SFLG_FREE_SCHEDULED);
 	erts_may_save_closed_port(pp);
 	erts_smp_port_minor_unlock(pp);
-	erts_smp_atomic_dec_nob(&pp->refc); /* Not alive */
-	ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&pp->refc) > 0); /* Lock */
+	erts_smp_atomic32_dec_nob(&pp->common.refc); /* Not alive */
+	ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&pp->common.refc) > 0); /* Lock */
 	handle_remaining_tasks(runq, pp); /* May release runq lock */
 	ASSERT(!pp->sched.exe_taskq && (!ptqp || !ptqp->first));
 	pp->sched.taskq = NULL;
@@ -777,8 +777,8 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 		handle_remaining_tasks(runq, pp);
 	    ASSERT(!ptqp->first
 		   && (!pp->sched.taskq || !pp->sched.taskq->first));
-	    erts_smp_atomic_dec_nob(&pp->refc); /* Not alive */
-	    ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&pp->refc) > 0); /* Lock */
+	    erts_smp_atomic32_dec_nob(&pp->common.refc); /* Not alive */
+	    ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&pp->common.refc) > 0); /* Lock */
 
 	    port_task_free(ptp);
 	    if (pp->sched.taskq)
@@ -926,9 +926,9 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     erts_port_release(pp);
 #else
     {
-	erts_aint_t refc;
+	erts_aint32_t refc;
 	erts_smp_mtx_unlock(pp->lock);
-	refc = erts_smp_atomic_dec_read_nob(&pp->refc);
+	refc = erts_smp_atomic32_dec_read_nob(&pp->common.refc);
 	ASSERT(refc >= 0);
 	if (refc == 0) {
 	    erts_smp_runq_unlock(runq);
@@ -975,13 +975,22 @@ handle_remaining_tasks(ErtsRunQueue *runq, Port *pp)
 	    case ERTS_PORT_TASK_TIMEOUT:
 		break;
 	    case ERTS_PORT_TASK_INPUT:
-		erts_stale_drv_select(pp->id, ptp->event, DO_READ, 1);
+		erts_stale_drv_select(pp->common.id,
+				      ptp->event,
+				      DO_READ,
+				      1);
 		break;
 	    case ERTS_PORT_TASK_OUTPUT:
-		erts_stale_drv_select(pp->id, ptp->event, DO_WRITE, 1);
+		erts_stale_drv_select(pp->common.id,
+				      ptp->event,
+				      DO_WRITE,
+				      1);
 		break;
 	    case ERTS_PORT_TASK_EVENT:
-		erts_stale_drv_select(pp->id, ptp->event, 0, 1);
+		erts_stale_drv_select(pp->common.id,
+				      ptp->event,
+				      0,
+				      1);
 		break;
 	    case ERTS_PORT_TASK_DIST_CMD:
 		break;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 6170fd1ec8..f9ff3c4bd5 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -760,7 +760,7 @@ proclist_create(Process *p)
 {
     ErtsProcList *plp = proclist_alloc();
     ensure_later_proc_interval(p->common.u.alive.started_interval);
-    plp->pid = p->id;
+    plp->pid = p->common.id;
     plp->started_interval = p->common.u.alive.started_interval;
     return plp;
 }
@@ -774,7 +774,7 @@ proclist_destroy(ErtsProcList *plp)
 static ERTS_INLINE int
 proclist_same(ErtsProcList *plp, Process *p)
 {
-    return (plp->pid == p->id
+    return (plp->pid == p->common.id
 	    && (plp->started_interval
 		== p->common.u.alive.started_interval));
 }
@@ -1493,7 +1493,7 @@ handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
 	    erts_smp_port_minor_lock(prt);
 	    /* We need to set the halt flag - get the port lock */
 #ifdef ERTS_SMP
-	    erts_smp_atomic_inc_nob(&prt->refc);
+	    erts_smp_atomic32_inc_nob(&prt->common.refc);
 #endif
 	    erts_smp_port_minor_unlock(prt);
 #ifdef ERTS_SMP
@@ -1512,7 +1512,7 @@ handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work)
 		erts_port_release(prt);
 		continue;
 	    }
-	    erts_do_exit_port(prt, prt->id, am_killed);
+	    erts_do_exit_port(prt, prt->common.id, am_killed);
 	    erts_port_release(prt);
 	}
 	if (erts_smp_atomic32_dec_read_nob(&erts_halt_progress) == 0) {
@@ -5429,7 +5429,7 @@ handle_pend_sync_suspend(Process *suspendee,
 	ASSERT(is_nil(suspender->suspendee));
 	if (suspendee_alive) {
 	    erts_suspend(suspendee, suspendee_locks, NULL);
-	    suspender->suspendee = suspendee->id;
+	    suspender->suspendee = suspendee->common.id;
 	}
 	/* suspender is suspended waiting for suspendee to suspend;
 	   resume suspender */
@@ -5450,7 +5450,7 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
     ERTS_SMP_LC_ASSERT(c_p_locks & ERTS_PROC_LOCK_MAIN);
     ERTS_SMP_LC_ASSERT(pid_locks & (ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS));
 
-    if (c_p->id == pid)
+    if (c_p->common.id == pid)
 	return erts_pid2proc(c_p, c_p_locks, pid, pid_locks);
 
     if (c_p_locks & ERTS_PROC_LOCK_STATUS)
@@ -5502,7 +5502,7 @@ pid2proc_not_running(Process *c_p, ErtsProcLocks c_p_locks,
 	 */
 	if (!c_p->pending_suspenders) {
 	    /* Mark rp pending for suspend by c_p */
-	    add_pend_suspend(rp, c_p->id, handle_pend_sync_suspend);
+	    add_pend_suspend(rp, c_p->common.id, handle_pend_sync_suspend);
 	    ASSERT(is_nil(c_p->suspendee));
 
 	    /* Suspend c_p; when rp is suspended c_p will be resumed. */
@@ -5608,20 +5608,20 @@ handle_pend_bif_sync_suspend(Process *suspendee,
 	ASSERT(is_nil(suspender->suspendee));
 	if (!suspendee_alive)
 	    erts_delete_suspend_monitor(&suspender->suspend_monitors,
-					suspendee->id);
+					suspendee->common.id);
 	else {
 #ifdef DEBUG
 	    int res;
 #endif
 	    ErtsSuspendMonitor *smon;
 	    smon = erts_lookup_suspend_monitor(suspender->suspend_monitors,
-					       suspendee->id);
+					       suspendee->common.id);
 #ifdef DEBUG
 	    res =
 #endif
 		do_bif_suspend_process(suspendee, smon, suspendee);
 	    ASSERT(!smon || res != 0);
-	    suspender->suspendee = suspendee->id;
+	    suspender->suspendee = suspendee->common.id;
 	}
 	/* suspender is suspended waiting for suspendee to suspend;
 	   resume suspender */
@@ -5650,14 +5650,14 @@ handle_pend_bif_async_suspend(Process *suspendee,
 	ASSERT(is_nil(suspender->suspendee));
 	if (!suspendee_alive)
 	    erts_delete_suspend_monitor(&suspender->suspend_monitors,
-					suspendee->id);
+					suspendee->common.id);
 	else {
 #ifdef DEBUG
 	    int res;
 #endif
 	    ErtsSuspendMonitor *smon;
 	    smon = erts_lookup_suspend_monitor(suspender->suspend_monitors,
-					       suspendee->id);
+					       suspendee->common.id);
 #ifdef DEBUG
 	    res =
 #endif
@@ -5702,7 +5702,7 @@ suspend_process_2(BIF_ALIST_2)
     int unless_suspending = 0;
 
 
-    if (BIF_P->id == BIF_ARG_1)
+    if (BIF_P->common.id == BIF_ARG_1)
 	goto badarg; /* We are not allowed to suspend ourselves */
 
     if (is_not_nil(BIF_ARG_2)) {
@@ -5798,7 +5798,7 @@ suspend_process_2(BIF_ALIST_2)
 
 		if (!do_bif_suspend_process(BIF_P, smon, suspendee))
 		    add_pend_suspend(suspendee,
-				     BIF_P->id,
+				     BIF_P->common.id,
 				     handle_pend_bif_async_suspend);
 
 		res = am_true;
@@ -5861,7 +5861,7 @@ suspend_process_2(BIF_ALIST_2)
 	    else {
 		/* Mark suspendee pending for suspend by BIF_P */
 		add_pend_suspend(suspendee,
-				 BIF_P->id,
+				 BIF_P->common.id,
 				 handle_pend_bif_sync_suspend);
 
 		ASSERT(is_nil(BIF_P->suspendee));
@@ -5935,7 +5935,7 @@ resume_process_1(BIF_ALIST_1)
     Process *suspendee;
     int is_active;
  
-    if (BIF_P->id == BIF_ARG_1)
+    if (BIF_P->common.id == BIF_ARG_1)
 	BIF_ERROR(BIF_P, BADARG);
 
     erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
@@ -6060,7 +6060,8 @@ erts_process_status(Process *c_p, ErtsProcLocks c_p_locks,
 	for (i = 0; i < erts_no_schedulers; i++) {
 	    esdp = ERTS_SCHEDULER_IX(i);
 	    erts_smp_runq_lock(esdp->run_queue);
-	    if (esdp->free_process && esdp->free_process->id == rpid) {
+	    if (esdp->free_process
+		&& esdp->free_process->common.id == rpid) {
 		res = am_free;
 		erts_smp_runq_unlock(esdp->run_queue);
 		break;
@@ -6900,7 +6901,6 @@ static void early_init_process_struct(void *varg, Eterm data)
     Process *proc = arg->proc;
 
     proc->common.id = make_internal_pid(data);
-    proc->id = proc->common.id; /* to be removed */
     erts_smp_atomic32_init_relb(&proc->state, arg->state);
 
 #ifdef ERTS_SMP
@@ -7130,15 +7130,15 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 #endif
 
     p->common.u.alive.reg = NULL;
-    p->nlinks = NULL;
-    p->monitors = NULL;
+    ERTS_P_LINKS(p) = NULL;
+    ERTS_P_MONITORS(p) = NULL;
     p->nodes_monitors = NULL;
     p->suspend_monitors = NULL;
 
     ASSERT(is_pid(parent->group_leader));
 
     if (parent->group_leader == ERTS_INVALID_PID)
-	p->group_leader = p->id;
+	p->group_leader = p->common.id;
     else {
 	/* Needs to be done after the heap has been set up */
 	p->group_leader =
@@ -7170,7 +7170,9 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     DT_UTAG(p) = NIL;
     DT_UTAG_FLAGS(p) = 0;
 #endif
-    p->parent = parent->id == ERTS_INVALID_PID ? NIL : parent->id;
+    p->parent = (parent->common.id == ERTS_INVALID_PID
+		 ? NIL
+		 : parent->common.id);
 
 #ifdef HYBRID
     p->rrma  = NULL;
@@ -7190,7 +7192,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	    ERTS_TRACER_PROC(p) = ERTS_TRACER_PROC(parent);
 	}
 	if (ARE_TRACE_FLAGS_ON(parent, F_TRACE_PROCS)) {
-	    trace_proc_spawn(parent, p->id, mod, func, args);
+	    trace_proc_spawn(parent, p->common.id, mod, func, args);
 	}
 	if (ERTS_TRACE_FLAGS(parent) & F_TRACE_SOS1) {
 	    /* Overrides TRACE_CHILDREN */
@@ -7210,17 +7212,17 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	int ret;
 #endif
 	if (IS_TRACED_FL(parent, F_TRACE_PROCS)) {
-	    trace_proc(parent, parent, am_link, p->id);
+	    trace_proc(parent, parent, am_link, p->common.id);
 	}
 
 #ifdef DEBUG
-	ret = erts_add_link(&(parent->nlinks),  LINK_PID, p->id);
+	ret = erts_add_link(&ERTS_P_LINKS(parent),  LINK_PID, p->common.id);
 	ASSERT(ret == 0);
-	ret = erts_add_link(&(p->nlinks), LINK_PID, parent->id);
+	ret = erts_add_link(&ERTS_P_LINKS(p), LINK_PID, parent->common.id);
 	ASSERT(ret == 0);
 #else	
-	erts_add_link(&(parent->nlinks), LINK_PID, p->id);
-	erts_add_link(&(p->nlinks), LINK_PID, parent->id);
+	erts_add_link(&ERTS_P_LINKS(parent), LINK_PID, p->common.id);
+	erts_add_link(&ERTS_P_LINKS(p), LINK_PID, parent->common.id);
 #endif
 
 	if (IS_TRACED(parent)) {
@@ -7243,8 +7245,8 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 	Eterm mref;
 
 	mref = erts_make_ref(parent);
-	erts_add_monitor(&(parent->monitors), MON_ORIGIN, mref, p->id, NIL);
-	erts_add_monitor(&(p->monitors), MON_TARGET, mref, parent->id, NIL);
+	erts_add_monitor(&ERTS_P_MONITORS(parent), MON_ORIGIN, mref, p->common.id, NIL);
+	erts_add_monitor(&ERTS_P_MONITORS(p), MON_TARGET, mref, parent->common.id, NIL);
 	so->mref = mref;
     }
 
@@ -7271,7 +7273,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
 
-    res = p->id;
+    res = p->common.id;
 
     /*
      * Schedule process for execution.
@@ -7279,7 +7281,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
 
     schedule_process(p, state, 0);
 
-    VERBOSE(DEBUG_PROCESSES, ("Created a new process: %T\n",p->id));
+    VERBOSE(DEBUG_PROCESSES, ("Created a new process: %T\n",p->common.id));
 
 #ifdef USE_VM_PROBES
     if (DTRACE_ENABLED(process_spawn)) {
@@ -7314,7 +7316,7 @@ void erts_init_empty_process(Process *p)
     p->min_heap_size = 0;
     p->min_vheap_size = 0;
     p->rcount = 0;
-    p->id = ERTS_INVALID_PID;
+    p->common.id = ERTS_INVALID_PID;
     p->reds = 0;
     ERTS_TRACER_PROC(p) = NIL;
     ERTS_TRACE_FLAGS(p) = F_INITIAL_TRACE_FLAGS;
@@ -7349,8 +7351,8 @@ void erts_init_empty_process(Process *p)
     p->mbuf = NULL;
     p->mbuf_sz = 0;
     p->psd = NULL;
-    p->monitors = NULL;
-    p->nlinks = NULL;         /* List of links */
+    ERTS_P_MONITORS(p) = NULL;
+    ERTS_P_LINKS(p) = NULL;         /* List of links */
     p->nodes_monitors = NULL;
     p->suspend_monitors = NULL;
     p->msg.first = NULL;
@@ -7439,7 +7441,7 @@ erts_debug_verify_clean_empty_process(Process* p)
     ASSERT(p->stop == NULL);
     ASSERT(p->hend == NULL);
     ASSERT(p->heap == NULL);
-    ASSERT(p->id == ERTS_INVALID_PID);
+    ASSERT(p->common.id == ERTS_INVALID_PID);
     ASSERT(ERTS_TRACER_PROC(p) == NIL);
     ASSERT(ERTS_TRACE_FLAGS(p) == F_INITIAL_TRACE_FLAGS);
     ASSERT(p->group_leader == ERTS_INVALID_PID);
@@ -7454,8 +7456,8 @@ erts_debug_verify_clean_empty_process(Process* p)
     ASSERT(p->old_htop == NULL);
     ASSERT(p->old_heap == NULL);
 
-    ASSERT(p->monitors == NULL);
-    ASSERT(p->nlinks == NULL);
+    ASSERT(ERTS_P_MONITORS(p) == NULL);
+    ASSERT(ERTS_P_LINKS(p) == NULL);
     ASSERT(p->nodes_monitors == NULL);
     ASSERT(p->suspend_monitors == NULL);
     ASSERT(p->msg.first == NULL);
@@ -7517,7 +7519,7 @@ delete_process(Process* p)
 {
     ErlMessage* mp;
 
-    VERBOSE(DEBUG_PROCESSES, ("Removing process: %T\n",p->id));
+    VERBOSE(DEBUG_PROCESSES, ("Removing process: %T\n",p->common.id));
 
     /* Cleanup psd */
 
@@ -7591,8 +7593,6 @@ delete_process(Process* p)
 	mp = next_mp;
     }
 
-    ASSERT(!p->monitors);
-    ASSERT(!p->nlinks);
     ASSERT(!p->nodes_monitors);
     ASSERT(!p->suspend_monitors);
 
@@ -7785,7 +7785,7 @@ send_exit_message(Process *to, ErtsProcLocks *to_locksp,
 	hp = bp->mem;
 	mess = copy_struct(exit_term, term_size, &hp, &bp->off_heap);
 	/* the trace token must in this case be updated by the caller */
-	seq_trace_output(token, mess, SEQ_TRACE_SEND, to->id, NULL);
+	seq_trace_output(token, mess, SEQ_TRACE_SEND, to->common.id, NULL);
 	temp_token = copy_struct(token, sz_token, &hp, &bp->off_heap);
 	erts_queue_message(to, to_locksp, bp, mess, temp_token
 #ifdef USE_VM_PROBES
@@ -8077,7 +8077,7 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		if (!rp) {
 		    goto done;
 		}
-		rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
+		rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), mon->ref);
 		erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 		if (rmon == NULL) {
 		    goto done;
@@ -8128,13 +8128,13 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext)
 		goto done;
 	    }
 	    UseTmpHeapNoproc(3);
-	    rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
+	    rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), mon->ref);
 	    if (rmon) {
 		erts_destroy_monitor(rmon);
 		watched = (is_atom(mon->name)
 			   ? TUPLE2(lhp, mon->name, 
 				    erts_this_dist_entry->sysname)
-			   : pcontext->p->id);
+			   : pcontext->p->common.id);
 		erts_queue_monitor_message(rp, &rp_locks, mon->ref, am_process, 
 					   watched, pcontext->reason);
 	    }
@@ -8201,10 +8201,10 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 	if(is_internal_port(item)) {
 	    Port *prt = erts_id2port(item, NULL, 0);
 	    if (prt) {
-		rlnk = erts_remove_link(&prt->nlinks, p->id);
+		rlnk = erts_remove_link(&ERTS_P_LINKS(prt), p->common.id);
 		if (rlnk)
 		    erts_destroy_link(rlnk);
-		erts_do_exit_port(prt, p->id, reason);
+		erts_do_exit_port(prt, p->common.id, reason);
 		erts_port_release(prt);
 	    }
 	}
@@ -8213,7 +8213,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 	    erts_dsprintf(dsbufp,
 			  "Erroneous link between %T and external port %T "
 			  "found\n",
-			  p->id,
+			  p->common.id,
 			  item);
 	    erts_send_error_to_logger_nogl(dsbufp);
 	    ASSERT(0); /* It isn't possible to setup such a link... */
@@ -8223,14 +8223,14 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 				      | ERTS_PROC_LOCKS_XSIG_SEND);
 	    rp = erts_pid2proc(NULL, 0, item, rp_locks);
 	    if (rp) {
-		rlnk = erts_remove_link(&(rp->nlinks), p->id);
+		rlnk = erts_remove_link(&ERTS_P_LINKS(rp), p->common.id);
 		/* If rlnk == NULL, we got unlinked while exiting,
 		   i.e., do nothing... */
 		if (rlnk) {
 		    int xres;
 		    erts_destroy_link(rlnk);
 		    xres = send_exit_signal(NULL,
-					    p->id,
+					    p->common.id,
 					    rp,
 					    &rp_locks, 
 					    reason,
@@ -8242,7 +8242,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 		    if (xres >= 0 && IS_TRACED_FL(rp, F_TRACE_PROCS)) {
 			/* We didn't exit the process and it is traced */
 			if (IS_TRACED_FL(rp, F_TRACE_PROCS)) {
-			    trace_proc(p, rp, am_getting_unlinked, p->id);
+			    trace_proc(p, rp, am_getting_unlinked, p->common.id);
 			}
 		    }
 		}
@@ -8256,12 +8256,12 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 		ErtsDSigData dsd;
 		int code;
 		ErtsDistLinkData dld;
-		erts_remove_dist_link(&dld, p->id, item, dep);
+		erts_remove_dist_link(&dld, p->common.id, item, dep);
 		erts_smp_proc_lock(p, ERTS_PROC_LOCK_MAIN);
 		code = erts_dsig_prepare(&dsd, dep, p, ERTS_DSP_NO_LOCK, 0);
 		if (code == ERTS_DSIG_PREP_CONNECTED) {
-		    code = erts_dsig_send_exit_tt(&dsd, p->id, item, reason,
-						  SEQ_TRACE_TOKEN(p));
+		    code = erts_dsig_send_exit_tt(&dsd, p->common.id, item,
+						  reason, SEQ_TRACE_TOKEN(p));
 		    ASSERT(code == ERTS_DSIG_SEND_OK);
 		}
 		erts_smp_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
@@ -8276,7 +8276,7 @@ static void doit_exit_link(ErtsLink *lnk, void *vpcontext)
 	    /* dist entries have node links in a separate structure to 
 	       avoid confusion */
 	    erts_smp_de_links_lock(dep);
-	    rlnk = erts_remove_link(&(dep->node_links), p->id);
+	    rlnk = erts_remove_link(&(dep->node_links), p->common.id);
 	    erts_smp_de_links_unlock(dep);
 	    if (rlnk)
 		erts_destroy_link(rlnk);
@@ -8361,7 +8361,7 @@ erts_do_exit_process(Process* p, Eterm reason)
 	    trace_proc(p, p, am_exit, reason);
     }
 
-    erts_trace_check_exiting(p->id);
+    erts_trace_check_exiting(p->common.id);
 
     ASSERT((ERTS_TRACE_FLAGS(p) & F_INITIAL_TRACE_FLAGS)
 	   == F_INITIAL_TRACE_FLAGS);
@@ -8467,6 +8467,13 @@ erts_continue_exit_process(Process *p)
     yield_allowed = 0;
 #endif
 
+    /*
+     * Note! The monitor and link fields will be overwritten 
+     * by erts_ptab_delete_element() below.
+     */
+    mon = ERTS_P_MONITORS(p);
+    lnk = ERTS_P_LINKS(p);
+
     {
 	/* Do *not* use erts_get_runq_proc() */
 	ErtsRunQueue *rq;
@@ -8496,12 +8503,6 @@ erts_continue_exit_process(Process *p)
      * when the monitors and/or links hit.
      */
 
-    mon = p->monitors;
-    p->monitors = NULL; /* to avoid recursive deletion during traversal */
-
-    lnk = p->nlinks;
-    p->nlinks = NULL;
-
     {
 	/* Inactivate and notify free */
 	erts_aint32_t n, e, a = erts_smp_atomic32_read_nob(&p->state);
@@ -8545,7 +8546,7 @@ erts_continue_exit_process(Process *p)
 	UseTmpHeap(4,p);
 	hp = &tmp_heap[0];
 
-	exit_tuple = TUPLE3(hp, am_EXIT, p->id, reason);
+	exit_tuple = TUPLE3(hp, am_EXIT, p->common.id, reason);
 
 	exit_tuple_sz = size_object(exit_tuple);
 
@@ -8646,7 +8647,7 @@ set_timer(Process* p, Uint timeout)
 
 #ifdef ERTS_SMP
     erts_create_smp_ptimer(&p->common.u.alive.ptimer,
-			   p->id,
+			   p->common.id,
 			   (ErlTimeoutProc) timeout_proc,
 			   timeout);
 #else
@@ -8797,7 +8798,7 @@ erts_dbg_check_halloc_lock(Process *p)
 {
     if (ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(p))
 	return 1;
-    if (p->id == ERTS_INVALID_PID)
+    if (p->common.id == ERTS_INVALID_PID)
 	return 1;
     if (p->scheduler_data && p == p->scheduler_data->match_pseudo_process)
 	return 1;
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 22303973bf..6f882c5e57 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -703,7 +703,6 @@ struct ErtsPendingSuspend_ {
 struct process {
     ErtsPTabElementCommon common; /* *Need* to be first in struct */
 
-    Eterm id;			/* Duplicate (to be removed) */
     /* All fields in the PCB that differs between different heap
      * architectures, have been moved to the end of this struct to
      * make sure that as few offsets as possible differ. Different
@@ -747,7 +746,6 @@ struct process {
 				 * Only valid for the current process.
 				 */
     Uint32 rcount;		/* suspend count */
-    int  prio;			/* Priority of process */
     int  schedule_count;	/* Times left to reschedule a low prio process */
     Uint reds;			/* No of reductions for this process  */
     Eterm group_leader;		/* Pid in charge
@@ -759,9 +757,6 @@ struct process {
 
     Process *next;		/* Pointer to next process in run queue */
 
-    ErtsLink *nlinks;
-    ErtsMonitor *monitors;      /* The process monitors, both ends */
-
     struct ErtsNodesMonitor_ *nodes_monitors;
 
     ErtsSuspendMonitor *suspend_monitors; /* Processes suspended by
diff --git a/erts/emulator/beam/erl_process_dict.c b/erts/emulator/beam/erl_process_dict.c
index 93466da3aa..bf384c66e1 100644
--- a/erts/emulator/beam/erl_process_dict.c
+++ b/erts/emulator/beam/erl_process_dict.c
@@ -360,7 +360,7 @@ static void pd_hash_erase(Process *p, Eterm id, Eterm *ret)
 	erts_fprintf(stderr,
 		     "Process dictionary for process %T is broken, trying to "
 		     "display term found in line %d:\n"
-		     "%T\n", p->id, __LINE__, old);
+		     "%T\n", p->common.id, __LINE__, old);
 #endif
 	erl_exit(1, "Damaged process dictionary found during erase/1.");
     }
@@ -405,7 +405,7 @@ Eterm erts_pd_hash_get(Process *p, Eterm id)
 	erts_fprintf(stderr,
 		     "Process dictionary for process %T is broken, trying to "
 		     "display term found in line %d:\n"
-		     "%T\n", p->id, __LINE__, tmp);
+		     "%T\n", p->common.id, __LINE__, tmp);
 #endif
 	erl_exit(1, "Damaged process dictionary found during get/1.");
     }
@@ -614,7 +614,7 @@ static Eterm pd_hash_put(Process *p, Eterm id, Eterm value)
 	erts_fprintf(stderr,
 		     "Process dictionary for process %T is broken, trying to "
 		     "display term found in line %d:\n"
-		     "%T\n", p->id, __LINE__, old);
+		     "%T\n", p->common.id, __LINE__, old);
 #endif
 
 	erl_exit(1, "Damaged process dictionary found during put/2.");
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 5c0512b6d9..de2ebf73f0 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -86,7 +86,7 @@ dump_process_info(int to, void *to_arg, Process *p)
     ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
 
     if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0 && p->msg.first) {
-	erts_print(to, to_arg, "=proc_messages:%T\n", p->id);
+	erts_print(to, to_arg, "=proc_messages:%T\n", p->common.id);
 	for (mp = p->msg.first; mp != NULL; mp = mp->next) {
 	    Eterm mesg = ERL_MESSAGE_TERM(mp);
 	    if (is_value(mesg))
@@ -102,19 +102,19 @@ dump_process_info(int to, void *to_arg, Process *p)
 
     if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
 	if (p->dictionary) {
-	    erts_print(to, to_arg, "=proc_dictionary:%T\n", p->id);
+	    erts_print(to, to_arg, "=proc_dictionary:%T\n", p->common.id);
 	    erts_deep_dictionary_dump(to, to_arg,
 				      p->dictionary, dump_element_nl);
 	}
     }
 
     if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
-	erts_print(to, to_arg, "=proc_stack:%T\n", p->id);
+	erts_print(to, to_arg, "=proc_stack:%T\n", p->common.id);
 	for (sp = p->stop; sp < STACK_START(p); sp++) {
 	    yreg = stack_element_dump(to, to_arg, p, sp, yreg);
 	}
 
-	erts_print(to, to_arg, "=proc_heap:%T\n", p->id);
+	erts_print(to, to_arg, "=proc_heap:%T\n", p->common.id);
 	for (sp = p->stop; sp < STACK_START(p); sp++) {
 	    Eterm term = *sp;
 	    
diff --git a/erts/emulator/beam/erl_ptab.h b/erts/emulator/beam/erl_ptab.h
index 6e94130df9..b65db330e5 100644
--- a/erts/emulator/beam/erl_ptab.h
+++ b/erts/emulator/beam/erl_ptab.h
@@ -34,9 +34,13 @@
 #include "erl_thr_progress.h"
 #undef ERL_THR_PROGRESS_TSD_TYPE_ONLY
 #include "erl_alloc.h"
+#include "erl_monitors.h"
 
-#define ERTS_TRACER_PROC(P) (P)->common.tracer_proc
-#define ERTS_TRACE_FLAGS(P) (P)->common.trace_flags
+#define ERTS_TRACER_PROC(P) 	((P)->common.tracer_proc)
+#define ERTS_TRACE_FLAGS(P)	((P)->common.trace_flags)
+
+#define ERTS_P_LINKS(P)		((P)->common.u.alive.links)
+#define ERTS_P_MONITORS(P)	((P)->common.u.alive.monitors)
 
 #define IS_TRACED(p) \
     (ERTS_TRACER_PROC((p)) != NIL)
@@ -49,6 +53,8 @@ typedef struct {
     Eterm id;
 #ifdef ERTS_SMP
     erts_atomic32_t refc;
+#else
+    erts_smp_atomic32_t refc; /* Temporary solution during dev; to be removed! */
 #endif
     Eterm tracer_proc;
     Uint trace_flags;
@@ -57,6 +63,8 @@ typedef struct {
 	struct {
 	    Uint64 started_interval;
 	    struct reg_proc *reg;
+	    ErtsLink *links;
+	    ErtsMonitor *monitors;
 #ifdef ERTS_SMP
 	    ErtsSmpPTimer *ptimer;
 #else
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 739a0ee912..dd2a121165 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -409,7 +409,7 @@ WRITE_SYS_MSG_TO_PORT(Eterm unused_to,
     }
 
 #ifndef ERTS_SMP
-    if (!INVALID_TRACER_PORT(trace_port, trace_port->id))
+    if (!INVALID_TRACER_PORT(trace_port, trace_port->common.id))
 #endif
 	erts_raw_port_command(trace_port, buffer, ptr-buffer);
 
@@ -441,7 +441,7 @@ do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp) {
     message = TUPLE5(hp, am_trace_ts, pid, am_out, mfarity, timestamp);
     /* Note, hp is deliberately NOT incremented since it will be reused */
 
-    do_send_to_port(trace_port->id,
+    do_send_to_port(trace_port->common.id,
 		    trace_port,
 		    pid,
 		    SYS_MSG_TYPE_UNDEFINED,
@@ -451,7 +451,7 @@ do_send_schedfix_to_port(Port *trace_port, Eterm pid, Eterm timestamp) {
     hp += 5;
     hp = patch_ts(message, hp);
 
-    do_send_to_port(trace_port->id,
+    do_send_to_port(trace_port->common.id,
 		    trace_port,
 		    pid,
 		    SYS_MSG_TYPE_UNDEFINED,
@@ -508,7 +508,7 @@ send_to_port(Process *c_p, Eterm message,
 #endif
 	do_send_to_port(*tracer_pid,
 			trace_port,
-			c_p ? c_p->id : NIL,
+			c_p ? c_p->common.id : NIL,
 			SYS_MSG_TYPE_TRACE,
 			message);
 #ifndef ERTS_SMP
@@ -543,7 +543,7 @@ send_to_port(Process *c_p, Eterm message,
     trace_port->control_flags &= ~PORT_CONTROL_FLAG_HEAVY;
     do_send_to_port(*tracer_pid,
 		    trace_port,
-		    c_p ? c_p->id : NIL,
+		    c_p ? c_p->common.id : NIL,
 		    SYS_MSG_TYPE_TRACE,
 		    message);
 
@@ -557,7 +557,7 @@ send_to_port(Process *c_p, Eterm message,
 	 * just after writning the real trace message, and now gets scheduled
 	 * in again.
 	 */
-	do_send_schedfix_to_port(trace_port, c_p->id, ts);
+	do_send_schedfix_to_port(trace_port, c_p->common.id, ts);
     }
 
     erts_port_release(trace_port);
@@ -599,7 +599,7 @@ profile_send(Eterm from, Eterm message) {
 	if (profiler_port) {
 	    do_send_to_port(profiler,
 			    profiler_port,
-			    NIL, /* or current process->id */
+			    NIL, /* or current process->common.id */
 			    SYS_MSG_TYPE_SYSPROF,
 			    message);
 	    erts_port_release(profiler_port);
@@ -672,7 +672,7 @@ seq_trace_send_to_port(Process *c_p,
 #endif
 	do_send_to_port(seq_tracer,
 			trace_port,
-			c_p ? c_p->id : NIL,
+			c_p ? c_p->common.id : NIL,
 			SYS_MSG_TYPE_SEQTRACE,
 			message);
 
@@ -703,7 +703,7 @@ seq_trace_send_to_port(Process *c_p,
     trace_port->control_flags &= ~PORT_CONTROL_FLAG_HEAVY;
     do_send_to_port(seq_tracer,
 		    trace_port,
-		    c_p ? c_p->id : NIL,
+		    c_p ? c_p->common.id : NIL,
 		    SYS_MSG_TYPE_SEQTRACE,
 		    message);
 
@@ -717,7 +717,7 @@ seq_trace_send_to_port(Process *c_p,
 	 * just after writing the real trace message, and now gets scheduled
 	 * in again.
 	 */
-	do_send_schedfix_to_port(trace_port, c_p->id, ts);
+	do_send_schedfix_to_port(trace_port, c_p->common.id, ts);
     }
 
     erts_port_release(trace_port);
@@ -769,7 +769,7 @@ send_to_tracer(Process *tracee,
 	*hpp = patch_ts(msg, *hpp);
 
     if (is_internal_pid(ERTS_TRACER_PROC(tracee)))
-	ERTS_ENQ_TRACE_MSG(tracee->id, tracer_ref, msg, bp);
+	ERTS_ENQ_TRACE_MSG(tracee->common.id, tracer_ref, msg, bp);
     else {
 	ASSERT(is_internal_port(ERTS_TRACER_PROC(tracee)));
 	send_to_port(no_fake_sched ? NULL : tracee,
@@ -853,7 +853,7 @@ trace_sched_aux(Process *p, Eterm what, int never_fake_sched)
     }
 
     if (!sched_no) {
-	mess = TUPLE4(hp, am_trace, p->id, what, tmp);
+	mess = TUPLE4(hp, am_trace, p->common.id, what, tmp);
 	hp += 5;
     }
     else {
@@ -862,7 +862,7 @@ trace_sched_aux(Process *p, Eterm what, int never_fake_sched)
 #else
 	Eterm sched_id = make_small(1);
 #endif
-	mess = TUPLE5(hp, am_trace, p->id, what, sched_id, tmp);
+	mess = TUPLE5(hp, am_trace, p->common.id, what, sched_id, tmp);
 	hp += 6;
     }
 
@@ -920,7 +920,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
 	hp = local_heap;
-	mess = TUPLE5(hp, am_trace, p->id, operation, msg, to);
+	mess = TUPLE5(hp, am_trace, p->common.id, operation, msg, to);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
@@ -956,7 +956,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 			  sz_msg,
 			  &hp,
 			  off_heap);
-	mess = TUPLE5(hp, am_trace, p->id/* Local pid */, operation, msg, to);
+	mess = TUPLE5(hp, am_trace, p->common.id, operation, msg, to);
 	hp += 6;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -965,7 +965,7 @@ trace_send(Process *p, Eterm to, Eterm msg)
 	    patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -986,7 +986,7 @@ trace_receive(Process *rp, Eterm msg)
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
 	hp = local_heap;
-	mess = TUPLE4(hp, am_trace, rp->id, am_receive, msg);
+	mess = TUPLE4(hp, am_trace, rp->common.id, am_receive, msg);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(rp) & F_TIMESTAMP) {
@@ -1015,7 +1015,7 @@ trace_receive(Process *rp, Eterm msg)
 	hp = ERTS_ALLOC_SYSMSG_HEAP(hsz, &bp, &off_heap, tracer_ref);
 
 	msg = copy_struct(msg, sz_msg, &hp, off_heap);
-	mess = TUPLE4(hp, am_trace, rp->id/* Local pid */, am_receive, msg);
+	mess = TUPLE4(hp, am_trace, rp->common.id, am_receive, msg);
 	hp += 5;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -1024,7 +1024,7 @@ trace_receive(Process *rp, Eterm msg)
 	    patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(rp->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(rp->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -1034,14 +1034,14 @@ seq_trace_update_send(Process *p)
 {
     Eterm seq_tracer = erts_get_system_seq_tracer();
     ASSERT((is_tuple(SEQ_TRACE_TOKEN(p)) || is_nil(SEQ_TRACE_TOKEN(p))));
-    if ( (p->id == seq_tracer) || (SEQ_TRACE_TOKEN(p) == NIL)
+    if ( (p->common.id == seq_tracer) || (SEQ_TRACE_TOKEN(p) == NIL)
 #ifdef USE_VM_PROBES
 	 || (SEQ_TRACE_TOKEN(p) == am_have_dt_utag)
 #endif
 	 ) {
 	return 0;
     }
-    SEQ_TRACE_TOKEN_SENDER(p) = p->id; /* Internal pid */
+    SEQ_TRACE_TOKEN_SENDER(p) = p->common.id;
     SEQ_TRACE_TOKEN_SERIAL(p) = 
 	make_small(++(p -> seq_trace_clock));
     SEQ_TRACE_TOKEN_LASTCNT(p) = 
@@ -1256,7 +1256,7 @@ erts_trace_return_to(Process *p, BeamInstr *pc)
 	hp += 4;
     }
 	
-    mess = TUPLE4(hp, am_trace, p->id, am_return_to, mfa);
+    mess = TUPLE4(hp, am_trace, p->common.id, am_return_to, mfa);
     hp += 5;
 
     erts_smp_mtx_lock(&smq_mtx);
@@ -1290,7 +1290,7 @@ erts_trace_return_to(Process *p, BeamInstr *pc)
 	 * Copy the trace message into the buffer and enqueue it.
 	 */
 	mess = copy_struct(mess, size, &hp, off_heap);
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
     }
     UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
@@ -1326,7 +1326,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	return;
     }
     ASSERT(is_internal_pid(*tracer_pid) || is_internal_port(*tracer_pid));
-    if (*tracer_pid == p->id) {
+    if (*tracer_pid == p->common.id) {
 	/* Do not generate trace messages to oneself */
 	return;
     }
@@ -1337,7 +1337,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	 */
 	tracee_flags = &ERTS_TRACE_FLAGS(p);
 #ifdef ERTS_SMP
-	tracee = p->id;
+	tracee = p->common.id;
 #endif
     } else {
 	/* Tracer not specified in process structure =>
@@ -1366,7 +1366,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	hp = local_heap;
 	mfa = TUPLE3(hp, mod, name, make_small(arity));
 	hp += 4;
-	mess = TUPLE5(hp, am_trace, p->id, am_return_from, mfa, retval);
+	mess = TUPLE5(hp, am_trace, p->common.id, am_return_from, mfa, retval);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (*tracee_flags & F_TIMESTAMP) {
@@ -1408,7 +1408,7 @@ erts_trace_return(Process* p, BeamInstr* fi, Eterm retval, Eterm *tracer_pid)
 	mfa = TUPLE3(hp, mod, name, make_small(arity));
 	hp += 4;
 	retval = copy_struct(retval, retval_size, &hp, off_heap);
-	mess = TUPLE5(hp, am_trace, p->id/* Local pid */, am_return_from, mfa, retval);
+	mess = TUPLE5(hp, am_trace, p->common.id, am_return_from, mfa, retval);
 	hp += 6;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -1456,7 +1456,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	return;
     }
     ASSERT(is_internal_pid(*tracer_pid) || is_internal_port(*tracer_pid));
-    if (*tracer_pid == p->id) {
+    if (*tracer_pid == p->common.id) {
 	/* Do not generate trace messages to oneself */
 	return;
     }
@@ -1467,7 +1467,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	 */
 	tracee_flags = &ERTS_TRACE_FLAGS(p);
 #ifdef ERTS_SMP
-	tracee = p->id;
+	tracee = p->common.id;
 #endif
 	if (! (*tracee_flags & F_TRACE_CALLS)) {
 	    return;
@@ -1495,7 +1495,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	hp += 4;
 	cv = TUPLE2(hp, class, value);
 	hp += 3;
-	mess = TUPLE5(hp, am_trace, p->id, am_exception_from, mfa_tuple, cv);
+	mess = TUPLE5(hp, am_trace, p->common.id, am_exception_from, mfa_tuple, cv);
 	hp += 6;
 	ASSERT((hp - local_heap) <= LOCAL_HEAP_SIZE);
 	erts_smp_mtx_lock(&smq_mtx);
@@ -1541,7 +1541,7 @@ erts_trace_exception(Process* p, BeamInstr mfa[3], Eterm class, Eterm value,
 	value = copy_struct(value, value_size, &hp, off_heap);
 	cv = TUPLE2(hp, class, value);
 	hp += 3;
-	mess = TUPLE5(hp, am_trace, p->id/* Local pid */, 
+	mess = TUPLE5(hp, am_trace, p->common.id, 
 		      am_exception_from, mfa_tuple, cv);
 	hp += 6;
 
@@ -1602,7 +1602,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	return 0;
     }
     ASSERT(is_internal_pid(*tracer_pid) || is_internal_port(*tracer_pid));
-    if (*tracer_pid == p->id) {
+    if (*tracer_pid == p->common.id) {
 	/* Do not generate trace messages to oneself */
 	return 0;
     }
@@ -1613,7 +1613,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	 */
 	tracee_flags = &ERTS_TRACE_FLAGS(p);
 #ifdef ERTS_SMP
-	tracee = p->id;
+	tracee = p->common.id;
 #endif
     } else {
 	/* Tracer not specified in process structure =>
@@ -1781,7 +1781,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	 * Build the trace tuple and send it to the port.
 	 */
 	
-	mess = TUPLE4(hp, am_trace, p->id, am_call, mfa_tuple);
+	mess = TUPLE4(hp, am_trace, p->common.id, am_call, mfa_tuple);
 	hp += 5;
 	if (pam_result != am_true) {
 	    hp[-5] = make_arityval(5);
@@ -1954,7 +1954,7 @@ erts_call_trace(Process* p, BeamInstr mfa[3], Binary *match_spec,
 	 * Build the trace tuple and enqueue it.
 	 */
 	
-	mess = TUPLE4(hp, am_trace, p->id/* Local pid */, am_call, mfa_tuple);
+	mess = TUPLE4(hp, am_trace, p->common.id, am_call, mfa_tuple);
 	hp += 5;
 	if (pam_result != am_true) {
 	    hp[-5] = make_arityval(5);
@@ -1999,7 +1999,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 
 
 	hp = local_heap;
-	mess = TUPLE4(hp, am_trace, t_p->id, what, data);
+	mess = TUPLE4(hp, am_trace, t_p->common.id, what, data);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
@@ -2039,7 +2039,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 	hp = ERTS_ALLOC_SYSMSG_HEAP(need, &bp, &off_heap, tracer_ref);
 
 	tmp = copy_struct(data, sz_data, &hp, off_heap);
-	mess = TUPLE4(hp, am_trace, t_p->id/* Local pid */, what, tmp);
+	mess = TUPLE4(hp, am_trace, t_p->common.id, what, tmp);
 	hp += 5;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -2048,7 +2048,7 @@ trace_proc(Process *c_p, Process *t_p, Eterm what, Eterm data)
 	    hp = patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(t_p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(t_p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -2077,7 +2077,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 	hp = local_heap;
 	mfa = TUPLE3(hp, mod, func, args);
 	hp += 4;
-	mess = TUPLE5(hp, am_trace, p->id, am_spawn, pid, mfa);
+	mess = TUPLE5(hp, am_trace, p->common.id, am_spawn, pid, mfa);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
@@ -2111,7 +2111,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 	mfa = TUPLE3(hp, mod, func, tmp);
 	hp += 4;
 	tmp = copy_struct(pid, sz_pid, &hp, off_heap);
-	mess = TUPLE5(hp, am_trace, p->id, am_spawn, tmp, mfa);
+	mess = TUPLE5(hp, am_trace, p->common.id, am_spawn, tmp, mfa);
 	hp += 6;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -2120,7 +2120,7 @@ trace_proc_spawn(Process *p, Eterm pid,
 	    hp = patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -2431,7 +2431,7 @@ trace_gc(Process *p, Eterm what)
 				       tags,
 				       values);
 
-    msg = TUPLE4(hp, am_trace, p->id/* Local pid */, what, msg);
+    msg = TUPLE4(hp, am_trace, p->common.id, what, msg);
     hp += 5;
 
     erts_smp_mtx_lock(&smq_mtx);
@@ -2443,7 +2443,7 @@ trace_gc(Process *p, Eterm what)
     if (is_internal_port(ERTS_TRACER_PROC(p)))
 	send_to_port(p, msg, &ERTS_TRACER_PROC(p), &ERTS_TRACE_FLAGS(p));
     else
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, msg, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, msg, bp);
     erts_smp_mtx_unlock(&smq_mtx);
     UnUseTmpHeap(LOCAL_HEAP_SIZE,p);
 #undef LOCAL_HEAP_SIZE
@@ -2508,7 +2508,7 @@ monitor_long_gc(Process *p, Uint time) {
 					sizeof(values)/sizeof(Uint),
 					tags,
 					values);
-    msg = TUPLE4(hp, am_monitor, p->id/* Local pid */, am_long_gc, list); 
+    msg = TUPLE4(hp, am_monitor, p->common.id, am_long_gc, list); 
 
 #ifdef DEBUG
     hp += 5 /* 4-tuple */;
@@ -2516,7 +2516,7 @@ monitor_long_gc(Process *p, Uint time) {
 #endif
 
 #ifdef ERTS_SMP
-    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->id, NIL, msg, bp);
+    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
     erts_queue_message(monitor_p, NULL, bp, msg, NIL
 #ifdef USE_VM_PROBES
@@ -2583,7 +2583,7 @@ monitor_large_heap(Process *p) {
 					sizeof(values)/sizeof(Uint),
 					tags,
 					values);
-    msg = TUPLE4(hp, am_monitor, p->id/* Local pid */, am_large_heap, list); 
+    msg = TUPLE4(hp, am_monitor, p->common.id, am_large_heap, list); 
 
 #ifdef DEBUG
     hp += 5 /* 4-tuple */;
@@ -2591,7 +2591,7 @@ monitor_large_heap(Process *p) {
 #endif
 
 #ifdef ERTS_SMP
-    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->id, NIL, msg, bp);
+    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
     erts_queue_message(monitor_p, NULL, bp, msg, NIL
 #ifdef USE_VM_PROBES
@@ -2619,11 +2619,11 @@ monitor_generic(Process *p, Eterm type, Eterm spec) {
 
     hp = ERTS_ALLOC_SYSMSG_HEAP(5, &bp, &off_heap, monitor_p);
 
-    msg = TUPLE4(hp, am_monitor, p->id/* Local pid */, type, spec); 
+    msg = TUPLE4(hp, am_monitor, p->common.id, type, spec); 
     hp += 5;
 
 #ifdef ERTS_SMP
-    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->id, NIL, msg, bp);
+    enqueue_sys_msg(SYS_MSG_TYPE_SYSMON, p->common.id, NIL, msg, bp);
 #else
     erts_queue_message(monitor_p, NULL, bp, msg, NIL
 #ifdef USE_VM_PROBES
@@ -2752,7 +2752,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 
 	hp = local_heap;
 
-	mess = TUPLE5(hp, am_trace, calling_pid, am_open, p->id, drv_name);
+	mess = TUPLE5(hp, am_trace, calling_pid, am_open, p->common.id, drv_name);
 	hp += 6;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(p) & F_TIMESTAMP) {
@@ -2779,7 +2779,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(sz_data, &bp, &off_heap, tracer_ref);
 
-	mess = TUPLE5(hp, am_trace, calling_pid, am_open, p->id, drv_name);
+	mess = TUPLE5(hp, am_trace, calling_pid, am_open, p->common.id, drv_name);
 	hp += 6;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -2788,7 +2788,7 @@ trace_port_open(Port *p, Eterm calling_pid, Eterm drv_name) {
 	    hp = patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 
@@ -2815,7 +2815,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 	UseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 
 	hp = local_heap;
-	mess = TUPLE4(hp, am_trace, t_p->id, what, data);
+	mess = TUPLE4(hp, am_trace, t_p->common.id, what, data);
 	hp += 5;
 	erts_smp_mtx_lock(&smq_mtx);
 	if (ERTS_TRACE_FLAGS(t_p) & F_TIMESTAMP) {
@@ -2842,7 +2842,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 
 	hp = ERTS_ALLOC_SYSMSG_HEAP(sz_data, &bp, &off_heap, tracer_ref);
 
-	mess = TUPLE4(hp, am_trace, t_p->id, what, data);
+	mess = TUPLE4(hp, am_trace, t_p->common.id, what, data);
 	hp += 5;
 
 	erts_smp_mtx_lock(&smq_mtx);
@@ -2851,7 +2851,7 @@ trace_port(Port *t_p, Eterm what, Eterm data) {
 	    hp = patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(t_p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(t_p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -2891,10 +2891,10 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 #else
 		sched_id = make_small(1);
 #endif
-		mess = TUPLE5(hp, am_trace, p->id, what, sched_id, where);
+		mess = TUPLE5(hp, am_trace, p->common.id, what, sched_id, where);
 		ws = 6;
 	} else {
-		mess = TUPLE4(hp, am_trace, p->id, what, where);
+		mess = TUPLE4(hp, am_trace, p->common.id, what, where);
 		ws = 5;
 	}
 	hp += ws;
@@ -2932,9 +2932,9 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 #else
 		sched_id = make_small(1);
 #endif
-		mess = TUPLE5(hp, am_trace, p->id, what, sched_id, where);
+		mess = TUPLE5(hp, am_trace, p->common.id, what, sched_id, where);
 	} else {
-		mess = TUPLE4(hp, am_trace, p->id, what, where);
+		mess = TUPLE4(hp, am_trace, p->common.id, what, where);
 	}
 	hp += ws;
 
@@ -2944,7 +2944,7 @@ trace_sched_ports_where(Port *p, Eterm what, Eterm where) {
 	    hp = patch_ts(mess, hp);
 	}
 
-	ERTS_ENQ_TRACE_MSG(p->id, tracer_ref, mess, bp);
+	ERTS_ENQ_TRACE_MSG(p->common.id, tracer_ref, mess, bp);
 	erts_smp_mtx_unlock(&smq_mtx);
     }
 }
@@ -2980,14 +2980,14 @@ profile_runnable_port(Port *p, Eterm status) {
 
     GET_NOW(&Ms, &s, &us);
     timestamp = TUPLE3(hp, make_small(Ms), make_small(s), make_small(us)); hp += 4;
-    msg = TUPLE5(hp, am_profile, p->id, status, count, timestamp); hp += 6;
+    msg = TUPLE5(hp, am_profile, p->common.id, status, count, timestamp); hp += 6;
 
 #ifndef ERTS_SMP
-    profile_send(p->id, msg);
+    profile_send(p->common.id, msg);
     UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
 #else
-    enqueue_sys_msg_unlocked(SYS_MSG_TYPE_SYSPROF, p->id, NIL, msg, bp);
+    enqueue_sys_msg_unlocked(SYS_MSG_TYPE_SYSPROF, p->common.id, NIL, msg, bp);
 #endif
     erts_smp_mtx_unlock(&smq_mtx);
 }
@@ -3034,13 +3034,13 @@ profile_runnable_proc(Process *p, Eterm status){
 
     GET_NOW(&Ms, &s, &us);
     timestamp = TUPLE3(hp, make_small(Ms), make_small(s), make_small(us)); hp += 4;
-    msg = TUPLE5(hp, am_profile, p->id, status, where, timestamp); hp += 6;
+    msg = TUPLE5(hp, am_profile, p->common.id, status, where, timestamp); hp += 6;
 #ifndef ERTS_SMP
-    profile_send(p->id, msg);
+    profile_send(p->common.id, msg);
     UnUseTmpHeapNoproc(LOCAL_HEAP_SIZE);
 #undef LOCAL_HEAP_SIZE
 #else
-    enqueue_sys_msg_unlocked(SYS_MSG_TYPE_SYSPROF, p->id, NIL, msg, bp);
+    enqueue_sys_msg_unlocked(SYS_MSG_TYPE_SYSPROF, p->common.id, NIL, msg, bp);
 #endif
     erts_smp_mtx_unlock(&smq_mtx);
 }
@@ -3436,7 +3436,7 @@ sys_msg_dispatcher_func(void *unused)
 		proc = erts_whereis_process(NULL,0,receiver,proc_locks,0);
 		if (!proc)
 		    goto failure;
-		else if (smqp->from == proc->id)
+		else if (smqp->from == proc->common.id)
 		    goto drop_sys_msg;
 		else
 		    goto queue_proc_msg;
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 5386e0eb4e..d93ac723a4 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -39,38 +39,7 @@
 #include "erl_debug.h"
 #include "error.h"
 #include "erl_utils.h"
-
-typedef struct port Port;
-#include "erl_port_task.h"
-
-typedef struct erts_driver_t_ erts_driver_t;
-
-#define SMALL_IO_QUEUE 5   /* Number of fixed elements */
-
-typedef struct {
-    ErlDrvSizeT size;       /* total size in bytes */
-
-    SysIOVec* v_start;
-    SysIOVec* v_end;
-    SysIOVec* v_head;
-    SysIOVec* v_tail;
-    SysIOVec  v_small[SMALL_IO_QUEUE];
-
-    ErlDrvBinary** b_start;
-    ErlDrvBinary** b_end;
-    ErlDrvBinary** b_head;
-    ErlDrvBinary** b_tail;
-    ErlDrvBinary*  b_small[SMALL_IO_QUEUE];
-} ErlIOQueue;
-
-typedef struct line_buf {  /* Buffer used in line oriented I/O */
-    ErlDrvSizeT bufsiz;      /* Size of character buffer */
-    ErlDrvSizeT ovlen;       /* Length of overflow data */
-    ErlDrvSizeT ovsiz;       /* Actual size of overflow buffer */
-    char data[1];            /* Starting point of buffer data,
-			      data[0] is a flag indicating an unprocess CR,
-			      The rest is the overflow buffer. */
-} LineBuf;
+#include "erl_port.h"
 
 struct enif_environment_t /* ErlNifEnv */
 {
@@ -90,167 +59,6 @@ extern void erts_print_nif_taints(int to, void* to_arg);
 void erts_unload_nif(struct erl_module_nif* nif);
 extern void erl_nif_init(void);
 
-/*
- * Port Specific Data.
- *
- * Only use PrtSD for very rarely used data.
- */
-
-#define ERTS_PRTSD_SCHED_ID 0
-
-#define ERTS_PRTSD_SIZE 1
-
-typedef struct {
-    void *data[ERTS_PRTSD_SIZE];
-} ErtsPrtSD;
-
-#ifdef ERTS_SMP
-typedef struct ErtsXPortsList_ ErtsXPortsList;
-#endif
-
-/*
- * Port locking:
- *
- * Locking is done either driver specific or port specific. When
- * driver specific locking is used, all instances of the driver,
- * i.e. ports running the driver, share the same lock. When port
- * specific locking is used each instance have its own lock.
- *
- * Most fields in the Port structure are protected by the lock
- * referred to by the lock field. I'v called it the port lock.
- * This lock is shared between all ports running the same driver
- * when driver specific locking is used.
- *
- * The 'sched' field is protected by the port tasks lock
- * (see erl_port_tasks.c)
- *
- * The 'status' field is protected by a combination of the port lock,
- * the port tasks lock, and the state_lck. It may be read if
- * the state_lck, or the port lock is held. It may only be
- * modified if both the port lock and the state_lck is held
- * (with one exception; see below). When changeing status from alive
- * to dead or vice versa, also the port task lock has to be held.
- * This in order to guarantee that tasks are scheduled only for
- * ports that are alive.
- *
- * The status field may be modified with only the state_lck
- * held when status is changed from dead to alive. This since no
- * threads can have any references to the port other than via the
- * port table.
- *
- * /rickard
- */
-
-struct port {
-    ErtsPortTaskSched sched;
-    ErtsPortTaskHandle timeout_task;
-    erts_smp_atomic_t refc;
-#ifdef ERTS_SMP
-    erts_smp_mtx_t *lock;
-    ErtsXPortsList *xports;
-    erts_smp_atomic_t run_queue;
-    erts_smp_spinlock_t state_lck;  /* protects: id, status, snapshot */
-#endif
-    Eterm id;                   /* The Port id of this port */
-    Eterm connected;            /* A connected process */
-    Eterm caller;		/* Current caller. */
-    Eterm data;			/* Data associated with port. */
-    ErlHeapFragment* bp;	/* Heap fragment holding data (NULL if imm data). */
-    ErtsLink *nlinks;
-    ErtsMonitor *monitors;      /* Only MON_ORIGIN monitors of pid's */
-    Uint bytes_in;		/* Number of bytes read */
-    Uint bytes_out;		/* Number of bytes written */
-#ifdef ERTS_SMP
-    ErtsSmpPTimer *ptimer;
-#else
-    ErlTimer tm;                 /* Timer entry */
-#endif
-    
-    struct {
-	union {
-	    struct {
-		Eterm tracer_proc;		/* If the port is traced, this is the tracer */
-		Uint trace_flags;		/* Trace flags */
-	    } alive;
-	} u;
-    } common;
-
-    ErlIOQueue ioq;              /* driver accessible i/o queue */
-    DistEntry *dist_entry;       /* Dist entry used in DISTRIBUTION */
-    char *name;		         /* String used in the open */
-    erts_driver_t* drv_ptr;
-    UWord drv_data;
-    ErtsProcList *suspended;	 /* List of suspended processes. */
-    LineBuf *linebuf;            /* Buffer to hold data not ready for
-				    process to get (line oriented I/O)*/
-    erts_smp_atomic32_t state;	 /* Status and type flags */
-    int control_flags;		 /* Flags for port_control()  */
-    erts_aint32_t snapshot;      /* Next snapshot that port should be part of */
-    struct reg_proc *reg;
-    ErlDrvPDL port_data_lock;
-
-    ErtsPrtSD *psd;		 /* Port specific data */
-};
-
-
-ERTS_GLB_INLINE ErtsRunQueue *erts_port_runq(Port *prt);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE ErtsRunQueue *
-erts_port_runq(Port *prt)
-{
-#ifdef ERTS_SMP
-    ErtsRunQueue *rq1, *rq2;
-    rq1 = (ErtsRunQueue *) erts_smp_atomic_read_nob(&prt->run_queue);
-    if (!rq1)
-	return NULL;
-    while (1) {
-	erts_smp_runq_lock(rq1);
-	rq2 = (ErtsRunQueue *) erts_smp_atomic_read_nob(&prt->run_queue);
-	if (rq1 == rq2)
-	    return rq1;
-	erts_smp_runq_unlock(rq1);
-	rq1 = rq2;
-	if (!rq1)
-	    return NULL;
-    }
-#else
-    return ERTS_RUNQ_IX(0);
-#endif
-}
-
-#endif
-
-
-ERTS_GLB_INLINE void *erts_prtsd_get(Port *p, int ix);
-ERTS_GLB_INLINE void *erts_prtsd_set(Port *p, int ix, void *new);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE void *
-erts_prtsd_get(Port *prt, int ix)
-{
-    return prt->psd ? prt->psd->data[ix] : NULL;
-}
-
-ERTS_GLB_INLINE void *
-erts_prtsd_set(Port *prt, int ix, void *data)
-{
-    if (prt->psd) {
-	void *old = prt->psd->data[ix];
-	prt->psd->data[ix] = data;
-	return old;
-    }
-    else {
-	prt->psd = erts_alloc(ERTS_ALC_T_PRTSD, sizeof(ErtsPrtSD));
-	prt->psd->data[ix] = data;
-	return NULL;
-    }
-}
-
-#endif
-
 /* Driver handle (wrapper for old plain handle) */
 #define ERL_DE_OK      0
 #define ERL_DE_UNLOAD  1
@@ -534,40 +342,9 @@ union erl_off_heap_ptr {
     void* voidp;
 };
 
-/* arrays that get malloced at startup */
-extern Port* erts_port;
-
-extern Uint erts_max_ports;
-extern Uint erts_port_tab_index_mask;
-extern erts_smp_atomic32_t erts_ports_snapshot;
-extern erts_smp_atomic_t erts_dead_ports_ptr;
-
-ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE void erts_may_save_closed_port(Port *prt)
-{
-    ERTS_SMP_LC_ASSERT(erts_smp_lc_spinlock_is_locked(&prt->state_lck));
-    if (prt->snapshot != erts_smp_atomic32_read_acqb(&erts_ports_snapshot)) {
-	/* Dead ports are added from the end of the snapshot buffer */
-	Eterm* tombstone;
-	tombstone = (Eterm*) erts_smp_atomic_add_read_nob(&erts_dead_ports_ptr,
-							  -(erts_aint_t)sizeof(Eterm));
-	ASSERT(tombstone+1 != NULL);
-	ASSERT(prt->snapshot == erts_smp_atomic32_read_nob(&erts_ports_snapshot) - 1);
-	*tombstone = prt->id;
-    }
-    /*else no ongoing snapshot or port was already included or created after snapshot */
-}
-
-#endif
-
 /* controls warning mapping in error_logger */
 
 extern Eterm node_cookie;
-extern erts_smp_atomic_t erts_bytes_out;	/* no bytes written out */
-extern erts_smp_atomic_t erts_bytes_in;		/* no bytes sent into the system */
 extern Uint display_items;	/* no of items to display in traces etc */
 
 extern int erts_backtrace_depth;
@@ -791,54 +568,6 @@ do {									\
 #define WSTACK_ISEMPTY(s) (WSTK_CONCAT(s,_sp) == WSTK_CONCAT(s,_start))
 #define WSTACK_POP(s) (*(--WSTK_CONCAT(s,_sp)))
 
-
-/* port status flags */
-
-#define ERTS_PORT_SFLG_CONNECTED	((Uint32) (1 <<  0))
-/* Port have begun exiting */
-#define ERTS_PORT_SFLG_EXITING		((Uint32) (1 <<  1))
-/* Distribution port */
-#define ERTS_PORT_SFLG_DISTRIBUTION	((Uint32) (1 <<  2))
-#define ERTS_PORT_SFLG_BINARY_IO	((Uint32) (1 <<  3))
-#define ERTS_PORT_SFLG_SOFT_EOF		((Uint32) (1 <<  4))
-/* Flow control */
-#define ERTS_PORT_SFLG_PORT_BUSY	((Uint32) (1 <<  5))
-/* Port is closing (no i/o accepted) */
-#define ERTS_PORT_SFLG_CLOSING		((Uint32) (1 <<  6))
-/* Send a closed message when terminating */
-#define ERTS_PORT_SFLG_SEND_CLOSED	((Uint32) (1 <<  7))
-/* Line orinted io on port */  
-#define ERTS_PORT_SFLG_LINEBUF_IO	((Uint32) (1 <<  8))
-/* Immortal port (only certain system ports) */
-#define ERTS_PORT_SFLG_IMMORTAL		((Uint32) (1 <<  9))
-#define ERTS_PORT_SFLG_FREE		((Uint32) (1 << 10))
-#define ERTS_PORT_SFLG_FREE_SCHEDULED	((Uint32) (1 << 11))
-#define ERTS_PORT_SFLG_INITIALIZING	((Uint32) (1 << 12))
-/* Port uses port specific locking (opposed to driver specific locking) */
-#define ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK ((Uint32) (1 << 13))
-#define ERTS_PORT_SFLG_INVALID		((Uint32) (1 << 14))
-/* Last port to terminate halts the emulator */
-#define ERTS_PORT_SFLG_HALT		((Uint32) (1 << 15))
-#ifdef DEBUG
-/* Only debug: make sure all flags aren't cleared unintentionally */
-#define ERTS_PORT_SFLG_PORT_DEBUG	((Uint32) (1 << 31))
-#endif
-
-/* Combinations of port status flags */ 
-#define ERTS_PORT_SFLGS_DEAD						\
-  (ERTS_PORT_SFLG_FREE							\
-   | ERTS_PORT_SFLG_FREE_SCHEDULED					\
-   | ERTS_PORT_SFLG_INITIALIZING)
-#define ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP				\
-  (ERTS_PORT_SFLGS_DEAD | ERTS_PORT_SFLG_INVALID)
-#define ERTS_PORT_SFLGS_INVALID_LOOKUP					\
-  (ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP				\
-   | ERTS_PORT_SFLG_CLOSING)
-#define ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP				\
-  (ERTS_PORT_SFLGS_INVALID_LOOKUP					\
-   | ERTS_PORT_SFLG_PORT_BUSY						\
-   | ERTS_PORT_SFLG_DISTRIBUTION)
-
 /* binary.c */
 
 void erts_emasculate_writable_binary(ProcBin* pb);
@@ -1192,241 +921,6 @@ ErtsPortNames *erts_get_port_names(Eterm);
 void erts_free_port_names(ErtsPortNames *);
 Uint erts_port_ioq_size(Port *pp);
 void erts_stale_drv_select(Eterm, ErlDrvEvent, int, int);
-void erts_port_cleanup(Port *);
-void erts_fire_port_monitor(Port *prt, Eterm ref);
-#ifdef ERTS_SMP
-void erts_smp_xports_unlock(Port *);
-#endif
-
-#if defined(ERTS_SMP) && defined(ERTS_ENABLE_LOCK_CHECK)
-int erts_lc_is_port_locked(Port *);
-#endif
-
-ERTS_GLB_INLINE void erts_smp_port_minor_lock(Port*);
-ERTS_GLB_INLINE void erts_smp_port_minor_unlock(Port*);
-
-ERTS_GLB_INLINE int erts_smp_port_trylock(Port *prt);
-ERTS_GLB_INLINE void erts_smp_port_lock(Port *prt);
-ERTS_GLB_INLINE void erts_smp_port_unlock(Port *prt);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE void
-erts_smp_port_minor_lock(Port* prt)
-{
-#ifdef ERTS_SMP
-    erts_smp_spin_lock(&prt->state_lck);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_port_minor_unlock(Port *prt)
-{
-#ifdef ERTS_SMP
-    erts_smp_spin_unlock(&prt->state_lck);
-#endif
-}
-
-
-ERTS_GLB_INLINE int
-erts_smp_port_trylock(Port *prt)
-{
-    int res;
-
-    ASSERT(erts_smp_atomic_read_nob(&prt->refc) > 0);
-    erts_smp_atomic_inc_nob(&prt->refc);
-
-#ifdef ERTS_SMP
-    res = erts_smp_mtx_trylock(prt->lock);
-    if (res == EBUSY) {
-	erts_smp_atomic_dec_nob(&prt->refc);
-    }
-#else
-    res = 0;
-#endif
-
-    return res;
-}
-
-ERTS_GLB_INLINE void
-erts_smp_port_lock(Port *prt)
-{
-    ASSERT(erts_smp_atomic_read_nob(&prt->refc) > 0);
-    erts_smp_atomic_inc_nob(&prt->refc);
-#ifdef ERTS_SMP
-    erts_smp_mtx_lock(prt->lock);
-#endif
-}
-
-ERTS_GLB_INLINE void
-erts_smp_port_unlock(Port *prt)
-{
-    erts_aint_t refc;
-#ifdef ERTS_SMP
-    erts_smp_mtx_unlock(prt->lock);
-#endif
-    refc = erts_smp_atomic_dec_read_nob(&prt->refc);
-    ASSERT(refc >= 0);
-    if (refc == 0)
-	erts_port_cleanup(prt);
-}
-
-#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
-
-
-#define ERTS_INVALID_PORT_OPT(PP, ID, FLGS)			\
-    (!(PP)							\
-     || (erts_smp_atomic32_read_nob(&(PP)->state) & (FLGS))	\
-     || (PP)->id != (ID))
-
-/* port lookup */
-
-#define INVALID_PORT(PP, ID) \
-  ERTS_INVALID_PORT_OPT((PP), (ID), ERTS_PORT_SFLGS_INVALID_LOOKUP)
-
-/* Invalidate trace port if anything suspicious, for instance
- * that the port is a distribution port or it is busy.
- */
-#define INVALID_TRACER_PORT(PP, ID)					\
-  ERTS_INVALID_PORT_OPT((PP), (ID), ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP)
-
-#define ERTS_PORT_SCHED_ID(P, ID) \
-  ((Uint) (UWord) erts_prtsd_set((P), ERTS_PSD_SCHED_ID, (void *) (UWord) (ID)))
-
-#ifdef ERTS_SMP
-Port *erts_de2port(DistEntry *, Process *, ErtsProcLocks);
-#endif
-
-#define erts_id2port(ID, P, PL) \
-  erts_id2port_sflgs((ID), (P), (PL), ERTS_PORT_SFLGS_INVALID_LOOKUP)
-
-ERTS_GLB_INLINE Port*erts_id2port_sflgs(Eterm, Process *, ErtsProcLocks, Uint32);
-ERTS_GLB_INLINE void erts_port_release(Port *);
-ERTS_GLB_INLINE Port*erts_drvport2port(ErlDrvPort, erts_aint32_t *);
-ERTS_GLB_INLINE Port*erts_drvportid2port(Eterm);
-ERTS_GLB_INLINE Uint32 erts_portid2status(Eterm id);
-ERTS_GLB_INLINE int erts_is_port_alive(Eterm id);
-ERTS_GLB_INLINE int erts_is_valid_tracer_port(Eterm id);
-
-#if ERTS_GLB_INLINE_INCL_FUNC_DEF
-
-ERTS_GLB_INLINE Port*
-erts_id2port_sflgs(Eterm id, Process *c_p, ErtsProcLocks c_p_locks, Uint32 sflgs)
-{
-#ifdef ERTS_SMP
-    int no_proc_locks = !c_p || !c_p_locks;
-#endif
-    Port *prt;
-
-    if (is_not_internal_port(id))
-	return NULL;
-
-    prt = &erts_port[internal_port_index(id)];
-
-    erts_smp_port_minor_lock(prt);
-    if (ERTS_INVALID_PORT_OPT(prt, id, sflgs)) {
-	erts_smp_port_minor_unlock(prt);
-	prt = NULL;
-    }
-    else {
-	erts_smp_atomic_inc_nob(&prt->refc);
-	erts_smp_port_minor_unlock(prt);
-
-#ifdef ERTS_SMP
- 	if (no_proc_locks)
-	    erts_smp_mtx_lock(prt->lock);
-	else if (erts_smp_mtx_trylock(prt->lock) == EBUSY) {
-	    /* Unlock process locks, and acquire locks in lock order... */
-	    erts_smp_proc_unlock(c_p, c_p_locks);
-	    erts_smp_mtx_lock(prt->lock);
-	    erts_smp_proc_lock(c_p, c_p_locks);
-	}
-
-	/* The id may not have changed... */
-	ERTS_SMP_LC_ASSERT(prt->id == id);
-	/* ... but state may have... */
-	if (erts_smp_atomic32_read_nob(&prt->state) & sflgs) {
-	    erts_smp_port_unlock(prt); /* Also decrements refc... */
-	    prt = NULL;
-	}
-#endif
-
-    }
-
-    return prt;
-}
-
-ERTS_GLB_INLINE void
-erts_port_release(Port *prt)
-{
-    erts_smp_port_unlock(prt);
-}
-
-ERTS_GLB_INLINE Port*
-erts_drvport2port(ErlDrvPort drvport, erts_aint32_t *statep)
-{
-    int ix = (int) drvport;
-    erts_aint32_t state;
-    if (ix < 0 || erts_max_ports <= ix)
-	return NULL;
-    state = erts_smp_atomic32_read_nob(&erts_port[ix].state);
-    if (state & ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP)
-	return NULL;
-    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(&erts_port[ix]));
-    if (statep)
-	*statep = state;
-    return &erts_port[ix];
-}
-
-ERTS_GLB_INLINE Port*
-erts_drvportid2port(Eterm id)
-{
-    int ix;
-    erts_aint32_t state;
-    if (is_not_internal_port(id))
-	return NULL;
-    ix = (int) internal_port_index(id);
-    if (erts_max_ports <= ix)
-	return NULL;
-    state = erts_smp_atomic32_read_nob(&erts_port[ix].state);
-    if (state & ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP)
-	return NULL;
-    if (erts_port[ix].id != id)
-	return NULL;
-    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(&erts_port[ix]));
-    return &erts_port[ix];
-}
-
-ERTS_GLB_INLINE Uint32
-erts_portid2status(Eterm id)
-{
-    if (is_not_internal_port(id))
-	return ERTS_PORT_SFLG_INVALID;
-    else {
-	erts_aint32_t state;
-	int ix = internal_port_index(id);
-	if (erts_max_ports <= ix)
-	    return ERTS_PORT_SFLG_INVALID;
-	state = erts_smp_atomic32_read_ddrb(&erts_port[ix].state);
-	if (erts_port[ix].id != id)
-	    return ERTS_PORT_SFLG_INVALID;
-	return state;
-    }
-}
-
-ERTS_GLB_INLINE int
-erts_is_port_alive(Eterm id)
-{
-    return !(erts_portid2status(id) & (ERTS_PORT_SFLG_INVALID
-				       | ERTS_PORT_SFLGS_DEAD));
-}
-
-ERTS_GLB_INLINE int
-erts_is_valid_tracer_port(Eterm id)
-{
-    return !(erts_portid2status(id) & ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP);
-}
-#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 /* erl_drv_thread.c */
 void erl_drv_thr_init(void);
@@ -1897,15 +1391,15 @@ dtrace_pid_str(Eterm pid, char *process_buf)
 ERTS_GLB_INLINE void
 dtrace_proc_str(Process *process, char *process_buf)
 {
-    dtrace_pid_str(process->id, process_buf);
+    dtrace_pid_str(process->common.id, process_buf);
 }
 
 ERTS_GLB_INLINE void
 dtrace_port_str(Port *port, char *port_buf)
 {
     erts_snprintf(port_buf, DTRACE_TERM_BUF_SIZE, "#Port<%lu.%lu>",
-                  port_channel_no(port->id),
-                  port_number(port->id));
+                  port_channel_no(port->common.id),
+                  port_number(port->common.id));
 }
 
 ERTS_GLB_INLINE void
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 00ecf1fca2..b772783f64 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -257,8 +257,8 @@ get_free_port(void)
 	    if (act == exp) {
 		last_port_num = num;
 		erts_smp_spin_unlock(&get_free_port_lck);
-		ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&port->refc) == 0);
-		erts_smp_atomic_set_nob(&port->refc, 2); /* Port alive + lock */
+		ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&port->common.refc) == 0);
+		erts_smp_atomic32_set_nob(&port->common.refc, 2); /* Port alive + lock */
 		return num & port_num_mask;
 	    }
 	}
@@ -300,7 +300,6 @@ erts_test_next_port(int set, Uint next)
     return res;
 }
 
-
 static void port_cleanup(Port *prt);
 
 #ifdef ERTS_SMP
@@ -346,7 +345,7 @@ port_cleanup(Port *prt)
     ERTS_LC_ASSERT(state & ERTS_PORT_SFLG_PORT_DEBUG);
     ERTS_LC_ASSERT(!(state & ERTS_PORT_SFLG_FREE));
 
-    ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&prt->refc) == 0);
+    ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&prt->common.refc) == 0);
 
 #ifdef ERTS_SMP
     mtx = prt->lock;
@@ -464,17 +463,17 @@ setup_port(Port* prt, Eterm pid, erts_driver_t *driver,
     prt->bytes_in = 0;
     prt->bytes_out = 0;
     prt->dist_entry = NULL;
-    prt->reg = NULL;
+    prt->common.u.alive.reg = NULL;
 #ifdef ERTS_SMP
-    prt->ptimer = NULL;
+    prt->common.u.alive.ptimer = NULL;
 #else
-    sys_memset(&prt->tm, 0, sizeof(ErlTimer));
+    sys_memset(&prt->common.u.alive.tm, 0, sizeof(ErlTimer));
 #endif
     erts_port_task_handle_init(&prt->timeout_task);
     prt->suspended  = NULL;
     sys_strcpy(prt->name, name);
-    prt->nlinks = NULL;
-    prt->monitors = NULL;
+    ERTS_P_LINKS(prt) = NULL;
+    ERTS_P_MONITORS(prt) = NULL;
     prt->linebuf = NULL;
     prt->bp = NULL;
     prt->data = am_undefined;
@@ -542,7 +541,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 
     port_ix = port_num & erts_port_tab_index_mask;
     port = &erts_port[port_ix];
-    port->id = make_internal_port(port_num);
+    port->common.id = make_internal_port(port_num);
 
     erts_smp_mtx_lock(&erts_driver_list_lock);
     if (!driver) {
@@ -603,8 +602,8 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 	    *error_number_ptr = BADARG;
 	}
 	/* Need to mark the port as free again */
-	ERTS_LC_ASSERT(erts_smp_atomic_read_nob(&port->refc) == 2);
-	erts_smp_atomic_set_nob(&port->refc, 0); 
+	ERTS_LC_ASSERT(erts_smp_atomic32_read_nob(&port->common.refc) == 2);
+	erts_smp_atomic32_set_nob(&port->common.refc, 0); 
 	erts_smp_atomic32_set_relb(&port->state, ERTS_PORT_SFLG_FREE);
 	return -3;
     }
@@ -622,7 +621,7 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 					      sizeof(erts_smp_mtx_t));
 	erts_smp_mtx_init_x(port->lock,
 			    "port_lock",
-			    port->id);
+			    port->common.id);
 	xstate |= ERTS_PORT_SFLG_PORT_SPECIFIC_LOCK;
     }
 #endif
@@ -686,9 +685,9 @@ erts_open_driver(erts_driver_t* driver,	/* Pointer to driver. */
 	 * Must clean up the port.
 	 */
 #ifdef ERTS_SMP
-	erts_cancel_smp_ptimer(port->ptimer);
+	erts_cancel_smp_ptimer(port->common.u.alive.ptimer);
 #else
-	erts_cancel_timer(&(port->tm));
+	erts_cancel_timer(&(port->common.u.alive.tm));
 #endif
 	stopq(port);
 	kill_port(port);
@@ -794,10 +793,10 @@ driver_create_port(ErlDrvPort creator_port_ix, /* Creating port */
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(port));
 
     setup_port(port, pid, driver, drv_data, name, xstate);
-    port->id = port_id;
+    port->common.id = port_id;
 
-    erts_add_link(&(port->nlinks), LINK_PID, pid);
-    erts_add_link(&(rp->nlinks), LINK_PID, port_id);
+    erts_add_link(&ERTS_P_LINKS(port), LINK_PID, pid);
+    erts_add_link(&ERTS_P_LINKS(rp), LINK_PID, port_id);
     erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
     return port_num & erts_port_tab_index_mask;
 }
@@ -1339,7 +1338,7 @@ void init_io(void)
 
     for (i = 0; i < erts_max_ports; i++) {
 	erts_port_task_init_sched(&erts_port[i].sched);
-	erts_smp_atomic_init_nob(&erts_port[i].refc, 0);
+	erts_smp_atomic32_init_nob(&erts_port[i].common.refc, 0);
 #ifdef ERTS_SMP
 	erts_port[i].lock = NULL;
 	erts_port[i].xports = NULL;
@@ -1351,8 +1350,8 @@ void init_io(void)
 	erts_port[i].drv_ptr = NULL;
 	erts_smp_atomic32_init_nob(&erts_port[i].state, ERTS_PORT_SFLG_FREE);
 	erts_port[i].name = NULL;
-	erts_port[i].nlinks = NULL;
-	erts_port[i].monitors = NULL;
+	ERTS_P_LINKS(&erts_port[i]) = NULL;
+	ERTS_P_MONITORS(&erts_port[i]) = NULL;
 	erts_port[i].linebuf = NULL;
 	erts_port[i].port_data_lock = NULL;
     }
@@ -1669,7 +1668,7 @@ static void deliver_read_message(Port* prt, erts_aint32_t state, Eterm to,
     tuple = TUPLE2(hp, am_data, listp);
     hp += 3;
 
-    tuple = TUPLE2(hp, prt->id, tuple);
+    tuple = TUPLE2(hp, prt->common.id, tuple);
     hp += 3;
 
     erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined
@@ -1840,7 +1839,7 @@ deliver_vec_message(Port* prt,			/* Port */
 
     tuple = TUPLE2(hp, am_data, listp);
     hp += 3;
-    tuple = TUPLE2(hp, prt->id, tuple);
+    tuple = TUPLE2(hp, prt->common.id, tuple);
     hp += 3;
 
     erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined
@@ -1926,14 +1925,14 @@ terminate_port(Port *prt)
     ERTS_SMP_CHK_NO_PROC_LOCKS;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 
-    ASSERT(!prt->nlinks);
-    ASSERT(!prt->monitors);
+    ASSERT(!ERTS_P_LINKS(prt));
+    ASSERT(!ERTS_P_MONITORS(prt));
 
     /* state may be altered by kill_port() below */
     state = erts_smp_atomic32_read_band_nob(&prt->state,
 					    ~ERTS_PORT_SFLG_SEND_CLOSED);
     if (state & ERTS_PORT_SFLG_SEND_CLOSED) {
-	send_closed_port_id = prt->id;
+	send_closed_port_id = prt->common.id;
 	connected_id = prt->connected;
     }
     else {
@@ -1941,9 +1940,9 @@ terminate_port(Port *prt)
     }
 
 #ifdef ERTS_SMP
-    erts_cancel_smp_ptimer(prt->ptimer);
+    erts_cancel_smp_ptimer(prt->common.u.alive.ptimer);
 #else
-    erts_cancel_timer(&prt->tm);
+    erts_cancel_timer(&prt->common.u.alive.tm);
 #endif
 
     drv = prt->drv_ptr;
@@ -2016,7 +2015,7 @@ static void sweep_one_monitor(ErtsMonitor *mon, void *vpsc)
     if (!rp) {
 	goto done;
     }
-    rmon = erts_remove_monitor(&(rp->monitors),mon->ref);
+    rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), mon->ref);
     erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
     if (rmon == NULL) {
 	goto done;
@@ -2070,7 +2069,7 @@ static void sweep_one_link(ErtsLink *lnk, void *vpsc)
 	ASSERT(is_internal_pid(lnk->pid));
 	rp = erts_pid2proc(NULL, 0, lnk->pid, rp_locks);
 	if (rp) {
-	    ErtsLink *rlnk = erts_remove_link(&(rp->nlinks), psc->port);
+	    ErtsLink *rlnk = erts_remove_link(&ERTS_P_LINKS(rp), psc->port);
 
 	    if (rlnk) {
 		int xres = erts_send_exit_signal(NULL,
@@ -2136,7 +2135,7 @@ erts_do_exit_port(Port *p, Eterm from, Eterm reason)
 		 | ERTS_PORT_SFLG_EXITING
 		 | ERTS_PORT_SFLG_IMMORTAL))
        || ((reason == am_normal) &&
-	   ((from != p->connected) && (from != p->id)))) {
+	   ((from != p->connected) && (from != p->common.id)))) {
       return;
    }
 
@@ -2144,29 +2143,29 @@ erts_do_exit_port(Port *p, Eterm from, Eterm reason)
    	trace_port(p, am_closed, reason);
    }
 
-   erts_trace_check_exiting(p->id);
+   erts_trace_check_exiting(p->common.id);
 
    /*
     * Setting the port to not busy here, frees the list of pending
     * processes and makes them runnable.
     */
-   set_busy_port((ErlDrvPort)internal_port_index(p->id), 0);
+   set_busy_port((ErlDrvPort)internal_port_index(p->common.id), 0);
 
-   if (p->reg != NULL)
-       (void) erts_unregister_name(NULL, 0, p, p->reg->name);
+   if (p->common.u.alive.reg != NULL)
+       (void) erts_unregister_name(NULL, 0, p, p->common.u.alive.reg->name);
 
    state = erts_smp_atomic32_read_bor_relb(&p->state, ERTS_PORT_SFLG_EXITING);
 
    {
-       SweepContext sc = {p->id, rreason};
-       lnk = p->nlinks;
-       p->nlinks = NULL;
+       SweepContext sc = {p->common.id, rreason};
+       lnk = ERTS_P_LINKS(p);
+       ERTS_P_LINKS(p) = NULL;
        erts_sweep_links(lnk, &sweep_one_link, &sc);
    }
    DRV_MONITOR_LOCK_PDL(p);
    {
-       ErtsMonitor *moni = p->monitors;
-       p->monitors = NULL;
+       ErtsMonitor *moni = ERTS_P_MONITORS(p);
+       ERTS_P_MONITORS(p) = NULL;
        erts_sweep_monitors(moni, &sweep_one_monitor, NULL);
    } 
    DRV_MONITOR_UNLOCK_PDL(p);
@@ -2226,7 +2225,7 @@ void erts_port_command(Process *proc,
 
     erts_smp_proc_unlock(proc, ERTS_PROC_LOCK_MAIN);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
-    ASSERT(!INVALID_PORT(port, port->id));
+    ASSERT(!INVALID_PORT(port, port->common.id));
 
     if (is_tuple_arity(command, 2)) {
 	tp = tuple_val(command);
@@ -2257,7 +2256,7 @@ void erts_port_command(Process *proc,
 		    }
 #endif
 		    port->connected = tp[2];
-		    deliver_result(port->id, pid, am_connected);
+		    deliver_result(port->common.id, pid, am_connected);
 		    goto done;
 		}
 	    }
@@ -2270,7 +2269,7 @@ void erts_port_command(Process *proc,
 				    port->connected, rp_locks);
 	if (rp) {
 	    (void) erts_send_exit_signal(NULL,
-					 port->id,
+					 port->common.id,
 					 rp,
 					 &rp_locks, 
 					 am_badsig,
@@ -2351,7 +2350,7 @@ erts_port_control(Process* p, Port* prt, Uint command, Eterm iolist)
 	}
     }
 
-    prt->caller = p->id;	/* Internal pid */
+    prt->caller = p->common.id;	/* Internal pid */
 
     erts_smp_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
     ERTS_SMP_CHK_NO_PROC_LOCKS;
@@ -2465,32 +2464,32 @@ print_port_info(int to, void *arg, int i)
     if (state & ERTS_PORT_SFLGS_DEAD)
 	return;
 
-    erts_print(to, arg, "=port:%T\n", p->id);
+    erts_print(to, arg, "=port:%T\n", p->common.id);
     erts_print(to, arg, "Slot: %d\n", i);
     if (state & ERTS_PORT_SFLG_CONNECTED) {
 	erts_print(to, arg, "Connected: %T", p->connected);
 	erts_print(to, arg, "\n");
     }
 
-    if (p->nlinks != NULL) {
+    if (ERTS_P_LINKS(p)) {
 	prt_one_lnk_data prtd;
 	prtd.to = to;
 	prtd.arg = arg;
 	erts_print(to, arg, "Links: ");
-	erts_doforall_links(p->nlinks, &prt_one_lnk, &prtd);
+	erts_doforall_links(ERTS_P_LINKS(p), &prt_one_lnk, &prtd);
 	erts_print(to, arg, "\n");
     }
-    if (p->monitors != NULL) {
+    if (ERTS_P_MONITORS(p)) {
 	prt_one_lnk_data prtd;
 	prtd.to = to;
 	prtd.arg = arg;
 	erts_print(to, arg, "Monitors: ");
-	erts_doforall_monitors(p->monitors, &prt_one_monitor, &prtd);
+	erts_doforall_monitors(ERTS_P_MONITORS(p), &prt_one_monitor, &prtd);
 	erts_print(to, arg, "\n");
     }
 
-    if (p->reg != NULL)
-	erts_print(to, arg, "Registered as: %T\n", p->reg->name);
+    if (p->common.u.alive.reg != NULL)
+	erts_print(to, arg, "Registered as: %T\n", p->common.u.alive.reg->name);
 
     if (p->drv_ptr == &fd_driver) {
 	erts_print(to, arg, "Port is UNIX fd not opened by emulator: %s\n", p->name);
@@ -2678,12 +2677,12 @@ int async_ready(Port *p, void* data)
 static void
 report_missing_drv_callback(Port *p, char *drv_type, char *callback)
 {
-    ErtsPortNames *pnp = erts_get_port_names(p->id);
+    ErtsPortNames *pnp = erts_get_port_names(p->common.id);
     char *unknown = "<unknown>";
     char *drv_name = pnp->driver_name ? pnp->driver_name : unknown;
     char *prt_name = pnp->name ? pnp->name : unknown;
     erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();    
-    erts_dsprintf(dsbufp, "%T: %s driver '%s' ", p->id, drv_type, drv_name);
+    erts_dsprintf(dsbufp, "%T: %s driver '%s' ", p->common.id, drv_type, drv_name);
     if (sys_strcmp(drv_name, prt_name) != 0)
 	erts_dsprintf(dsbufp, "(%s) ", prt_name);
     erts_dsprintf(dsbufp, "does not implement the %s callback!\n", callback);
@@ -2764,7 +2763,7 @@ erts_get_port_names(Eterm id)
 		pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, pnp_len);
 	    }
 	    erts_smp_port_minor_lock(prt);
-	    if (id != prt->id) {
+	    if (id != prt->common.id) {
 		len = nlen = 0;
 		name = driver_name = NULL;
 	    }
@@ -2816,7 +2815,7 @@ static void schedule_port_timeout(Port *p)
      * /Rickard
      */
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(p));
-    (void) erts_port_task_schedule(p->id,
+    (void) erts_port_task_schedule(p->common.id,
 				   &p->timeout_task,
 				   ERTS_PORT_TASK_TIMEOUT,
 				   (ErlDrvEvent) -1,
@@ -2856,7 +2855,7 @@ void driver_report_exit(int ix, int status)
 
    tuple = TUPLE2(hp, am_exit_status, make_small(status));
    hp += 3;
-   tuple = TUPLE2(hp, prt->id, tuple);
+   tuple = TUPLE2(hp, prt->common.id, tuple);
 
    erts_queue_message(rp, &rp_locks, bp, tuple, am_undefined
 #ifdef USE_VM_PROBES
@@ -3864,7 +3863,7 @@ driver_pdl_create(ErlDrvPort dp)
     pdl_init_refc(pdl);
     pp->port_data_lock = pdl;
 #ifdef HARDDEBUG
-    erts_fprintf(stderr, "driver_pdl_create(%T) -> 0x%08X\r\n",pp->id,(unsigned) pdl);
+    erts_fprintf(stderr, "driver_pdl_create(%T) -> 0x%08X\r\n",pp->common.id,(unsigned) pdl);
 #endif
     return pdl;
 }
@@ -4302,12 +4301,12 @@ static ERTS_INLINE void
 drv_cancel_timer(Port *prt)
 {
 #ifdef ERTS_SMP
-    erts_cancel_smp_ptimer(prt->ptimer);
+    erts_cancel_smp_ptimer(prt->common.u.alive.ptimer);
 #else
-    erts_cancel_timer(&prt->tm);
+    erts_cancel_timer(&prt->common.u.alive.tm);
 #endif
     if (erts_port_task_is_scheduled(&prt->timeout_task))
-	erts_port_task_abort(prt->id, &prt->timeout_task);
+	erts_port_task_abort(prt->common.id, &prt->timeout_task);
 }
 
 int driver_set_timer(ErlDrvPort ix, unsigned long t)
@@ -4323,12 +4322,12 @@ int driver_set_timer(ErlDrvPort ix, unsigned long t)
 	return -1;
     drv_cancel_timer(prt);
 #ifdef ERTS_SMP
-    erts_create_smp_ptimer(&prt->ptimer,
-			   prt->id,
+    erts_create_smp_ptimer(&prt->common.u.alive.ptimer,
+			   prt->common.id,
 			   (ErlTimeoutProc) schedule_port_timeout,
 			   t);
 #else
-    erts_set_timer(&prt->tm,
+    erts_set_timer(&prt->common.u.alive.tm,
 		  (ErlTimeoutProc) schedule_port_timeout,
 		  NULL,
 		  prt,
@@ -4359,9 +4358,11 @@ driver_read_timer(ErlDrvPort ix, unsigned long* t)
 	return -1;
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
 #ifdef ERTS_SMP
-    *t = prt->ptimer ? erts_time_left(&prt->ptimer->timer.tm) : 0;
+    *t = (prt->common.u.alive.ptimer
+	  ? erts_time_left(&prt->common.u.alive.ptimer->timer.tm)
+	  : 0);
 #else
-    *t = erts_time_left(&prt->tm);
+    *t = erts_time_left(&prt->common.u.alive.tm);
 #endif
     return 0;
 }
@@ -4412,8 +4413,8 @@ static int do_driver_monitor_process(Port *prt,
     }
 
     ref = erts_make_ref_in_buffer(buf);
-    erts_add_monitor(&(prt->monitors), MON_ORIGIN, ref, rp->id, NIL);
-    erts_add_monitor(&(rp->monitors), MON_TARGET, ref, prt->id, NIL);
+    erts_add_monitor(&ERTS_P_MONITORS(prt), MON_ORIGIN, ref, rp->common.id, NIL);
+    erts_add_monitor(&ERTS_P_MONITORS(rp), MON_TARGET, ref, prt->common.id, NIL);
 
     erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
     ref_to_driver_monitor(ref,monitor);
@@ -4481,7 +4482,7 @@ static int do_driver_demonitor_process(Port *prt, Eterm *buf,
 
     memcpy(buf,monitor,sizeof(Eterm)*REF_THING_SIZE);
     ref = make_internal_ref(buf);
-    mon = erts_lookup_monitor(prt->monitors, ref);
+    mon = erts_lookup_monitor(ERTS_P_MONITORS(prt), ref);
     if (mon == NULL) {
 	return 1;
     }
@@ -4493,13 +4494,13 @@ static int do_driver_demonitor_process(Port *prt, Eterm *buf,
 			   to,
 			   ERTS_PROC_LOCK_LINK,
 			   ERTS_P2P_FLG_ALLOW_OTHER_X);
-    mon = erts_remove_monitor(&(prt->monitors), ref);
+    mon = erts_remove_monitor(&ERTS_P_MONITORS(prt), ref);
     if (mon) {
 	erts_destroy_monitor(mon);
     }
     if (rp) {
 	ErtsMonitor *rmon;
-	rmon = erts_remove_monitor(&(rp->monitors), ref);
+	rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
 	erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
 	if (rmon != NULL) {
 	    erts_destroy_monitor(rmon);
@@ -4563,7 +4564,7 @@ static ErlDrvTermData do_driver_get_monitored_process(Port *prt, Eterm *buf,
 
     memcpy(buf,monitor,sizeof(Eterm)*REF_THING_SIZE);
     ref = make_internal_ref(buf);
-    mon = erts_lookup_monitor(prt->monitors, ref);
+    mon = erts_lookup_monitor(ERTS_P_MONITORS(prt), ref);
     if (mon == NULL) {
 	return driver_term_nil;
     }
@@ -4637,7 +4638,7 @@ void erts_fire_port_monitor(Port *prt, Eterm ref)
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
     ASSERT(prt->drv_ptr != NULL);    
     DRV_MONITOR_LOCK_PDL(prt);
-    if (erts_lookup_monitor(prt->monitors,ref) == NULL) {
+    if (erts_lookup_monitor(ERTS_P_MONITORS(prt), ref) == NULL) {
 	DRV_MONITOR_UNLOCK_PDL(prt);
 	return;
     }
@@ -4656,7 +4657,7 @@ void erts_fire_port_monitor(Port *prt, Eterm ref)
     erts_unblock_fpe(fpe_was_unmasked);
     DRV_MONITOR_LOCK_PDL(prt);
     /* remove monitor *after* callback */
-    rmon = erts_remove_monitor(&(prt->monitors),ref);
+    rmon = erts_remove_monitor(&ERTS_P_MONITORS(prt), ref);
     DRV_MONITOR_UNLOCK_PDL(prt);
     if (rmon) {
 	erts_destroy_monitor(rmon);
@@ -4680,7 +4681,7 @@ driver_failure_term(ErlDrvPort ix, Eterm term, int eof)
     if (state & ERTS_PORT_SFLG_CLOSING) {
 	terminate_port(prt);
     } else if (eof && (state & ERTS_PORT_SFLG_SOFT_EOF)) {
-	deliver_result(prt->id, prt->connected, am_eof);
+	deliver_result(prt->common.id, prt->connected, am_eof);
     } else {
 	/* XXX UGLY WORK AROUND, Let do_exit_port terminate the port */
 	if (prt->port_data_lock)
@@ -4688,7 +4689,7 @@ driver_failure_term(ErlDrvPort ix, Eterm term, int eof)
 	prt->ioq.size = 0;
 	if (prt->port_data_lock)
 	    driver_pdl_unlock(prt->port_data_lock);
-	erts_do_exit_port(prt, prt->id, eof ? am_normal : term);
+	erts_do_exit_port(prt, prt->common.id, eof ? am_normal : term);
     }
     return 0;
 }
@@ -4714,10 +4715,10 @@ int driver_exit(ErlDrvPort ix, int err)
 
     rp = erts_pid2proc(NULL, 0, prt->connected, ERTS_PROC_LOCK_LINK);
     if (rp) {
-	rlnk = erts_remove_link(&(rp->nlinks),prt->id);
+	rlnk = erts_remove_link(&ERTS_P_LINKS(rp),prt->common.id);
     }
 
-    lnk = erts_remove_link(&(prt->nlinks),prt->connected);
+    lnk = erts_remove_link(&ERTS_P_LINKS(prt),prt->connected);
 
 #ifdef ERTS_SMP
     if (rp)
@@ -4776,7 +4777,7 @@ ErlDrvTermData driver_mk_port(ErlDrvPort ix)
 {
     Port* prt = erts_drvport2port(ix, NULL);
     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
-    return (ErlDrvTermData) prt->id;
+    return (ErlDrvTermData) prt->common.id;
 }
 
 ErlDrvTermData driver_connected(ErlDrvPort ix)
@@ -5006,7 +5007,7 @@ no_event_callback(ErlDrvData drv_data, ErlDrvEvent event, ErlDrvEventData event_
 {
     Port *prt = get_current_port();
     report_missing_drv_callback(prt, "Event", "event()");
-    driver_event((ErlDrvPort) internal_port_index(prt->id), event, NULL);
+    driver_event((ErlDrvPort) internal_port_index(prt->common.id), event, NULL);
 }
 
 static void
@@ -5014,7 +5015,7 @@ no_ready_input_callback(ErlDrvData drv_data, ErlDrvEvent event)
 {
     Port *prt = get_current_port();
     report_missing_drv_callback(prt, "Input", "ready_input()");
-    driver_select((ErlDrvPort) internal_port_index(prt->id), event, 
+    driver_select((ErlDrvPort) internal_port_index(prt->common.id), event, 
 		  (ERL_DRV_READ | ERL_DRV_USE_NO_CALLBACK), 0);
 }
 
@@ -5023,7 +5024,7 @@ no_ready_output_callback(ErlDrvData drv_data, ErlDrvEvent event)
 {
     Port *prt = get_current_port();
     report_missing_drv_callback(prt, "Output", "ready_output()");
-    driver_select((ErlDrvPort) internal_port_index(prt->id), event,
+    driver_select((ErlDrvPort) internal_port_index(prt->common.id), event,
 		  (ERL_DRV_WRITE | ERL_DRV_USE_NO_CALLBACK), 0);
 }
 
diff --git a/erts/emulator/beam/register.c b/erts/emulator/beam/register.c
index 9011eb0c10..feae745749 100644
--- a/erts/emulator/beam/register.c
+++ b/erts/emulator/beam/register.c
@@ -175,7 +175,7 @@ int erts_register_name(Process *c_p, Eterm name, Eterm id)
     if (is_not_atom(name) || name == am_undefined)
 	return res;
 
-    if (c_p->id == id) /* A very common case I think... */
+    if (c_p->common.id == id) /* A very common case I think... */
 	proc = c_p;
     else {
 	if (is_not_internal_pid(id) && is_not_internal_port(id))
@@ -212,7 +212,7 @@ int erts_register_name(Process *c_p, Eterm name, Eterm id)
 	ASSERT(!INVALID_PORT(port, id));
 	ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(port));
 	r.pt = port;
-	if (r.pt->reg)
+	if (r.pt->common.u.alive.reg)
 	    goto done;
 	r.p = NULL;
     }
@@ -230,10 +230,11 @@ int erts_register_name(Process *c_p, Eterm name, Eterm id)
     	if (IS_TRACED_FL(port, F_TRACE_PORTS)) {
 		trace_port(port, am_register, name);
 	}
-	port->reg = rp;
+	port->common.u.alive.reg = rp;
     }
 
-    if ((rp->p && rp->p->id == id) || (rp->pt && rp->pt->id == id)) {
+    if ((rp->p && rp->p->common.id == id)
+	|| (rp->pt && rp->pt->common.id == id)) {
 	res = 1;
     }
 
@@ -291,9 +292,9 @@ erts_whereis_name_to_id(Process *c_p, Eterm name)
 	     * is read only.
 	     */
 	    if (rp->p)
-		res = rp->p->id;
+		res = rp->p->common.id;
 	    else if (rp->pt)
-		res = rp->pt->id;
+		res = rp->pt->common.id;
 	    break;
 	}
 	b = b->next;
@@ -397,7 +398,7 @@ erts_whereis_name(Process *c_p,
 	    *port = NULL;
 	else {
 #ifndef ERTS_SMP
-	    erts_smp_atomic_inc_nob(&rp->pt->refc);
+	    erts_smp_atomic32_inc_nob(&rp->pt->common.refc);
 #else
 	    if (pending_port == rp->pt)
 		pending_port = NULL;
@@ -410,7 +411,7 @@ erts_whereis_name(Process *c_p,
 		}
 		    
 		if (erts_smp_port_trylock(rp->pt) == EBUSY) {
-		    Eterm id = rp->pt->id; /* id read only... */
+		    Eterm id = rp->pt->common.id; /* id read only... */
 		    /* Unlock all locks, acquire port lock, and restart... */
 		    if (current_c_p_locks) {
 			erts_smp_proc_unlock(c_p, current_c_p_locks);
@@ -506,7 +507,7 @@ int erts_unregister_name(Process *c_p,
 	if (rp->pt) {
 	    if (port != rp->pt) {
 #ifndef ERTS_SMP
-		erts_smp_atomic_inc_nob(&rp->pt->refc);
+		erts_smp_atomic32_inc_nob(&rp->pt->common.refc);
 #else
 		if (port) {
 		    ASSERT(port != c_prt);
@@ -515,7 +516,7 @@ int erts_unregister_name(Process *c_p,
 		}
 
 		if (erts_smp_port_trylock(rp->pt) == EBUSY) {
-		    Eterm id = rp->pt->id; /* id read only... */
+		    Eterm id = rp->pt->common.id; /* id read only... */
 		    /* Unlock all locks, acquire port lock, and restart... */
 		    if (current_c_p_locks) {
 			erts_smp_proc_unlock(c_p, current_c_p_locks);
@@ -532,7 +533,7 @@ int erts_unregister_name(Process *c_p,
 	    ASSERT(rp->pt == port);
 	    ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(port));
 
-	    rp->pt->reg = NULL;
+	    rp->pt->common.u.alive.reg = NULL;
 	    
 	    if (IS_TRACED_FL(port, F_TRACE_PORTS)) {
 		trace_port(port, am_unregister, r.name);
diff --git a/erts/emulator/hipe/hipe_debug.c b/erts/emulator/hipe/hipe_debug.c
index 8c3a14a201..f2e9d03607 100644
--- a/erts/emulator/hipe/hipe_debug.c
+++ b/erts/emulator/hipe/hipe_debug.c
@@ -190,12 +190,9 @@ void hipe_print_pcb(Process *p)
     U("min_heap_..", min_heap_size);
     U("rcount     ", rcount);
     U("id         ", common.id);
-    U("prio       ", prio);
     U("reds       ", reds);
-#if 0
-    U("tracer_pr..", tracer_proc);
-    U("trace_fla..", trace_flags);
-#endif
+    U("tracer_pr..", common.tracer_proc);
+    U("trace_fla..", common.trace_flags);
     U("group_lea..", group_leader);
     U("flags      ", flags);
     U("fvalue     ", fvalue);
@@ -204,10 +201,8 @@ void hipe_print_pcb(Process *p)
     /*XXX: ErlTimer tm; */
     U("next       ", next);
     /*XXX: ErlOffHeap off_heap; */
-#if 0
-    U("reg        ", reg);
-#endif
-    U("nlinks     ", nlinks);
+    U("reg        ", common.u.alive.reg);
+    U("nlinks     ", common.u.alive.links);
     /*XXX: ErlMessageQueue msg; */
     U("mbuf       ", mbuf);
     U("mbuf_sz    ", mbuf_sz);
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index d07d14028c..97e37ecba7 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -267,7 +267,7 @@ static const struct literal {
     { "P_HP_LIMIT", offsetof(struct process, stop) },
     { "P_OFF_HEAP_FIRST", offsetof(struct process, off_heap.first) },
     { "P_MBUF", offsetof(struct process, mbuf) },
-    { "P_ID", offsetof(struct process, id) },
+    { "P_ID", offsetof(struct process, common.id) },
     { "P_FLAGS", offsetof(struct process, flags) },
     { "P_FVALUE", offsetof(struct process, fvalue) },
     { "P_FREASON", offsetof(struct process, freason) },
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 20bc1a6f55..5d814e0164 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -206,7 +206,7 @@ drvport2id(ErlDrvPort dp)
 {
     Port *pp = erts_drvport2port(dp, NULL);
     if (pp)
-	return pp->id;
+	return pp->common.id;
     else {
 	ASSERT(0);
 	return am_undefined;
@@ -970,8 +970,8 @@ print_select_op(erts_dsprintf_buf_t *dsbufp,
 		  mode & ERL_DRV_USE ? " ERL_DRV_USE" : "",
 		  mode & (ERL_DRV_USE_NO_CALLBACK & ~ERL_DRV_USE) ? "_NO_CALLBACK" : "",
 		  on);
-    print_driver_name(dsbufp, pp->id);
-    erts_dsprintf(dsbufp, "driver %T ", pp ? pp->id : NIL);
+    print_driver_name(dsbufp, pp->common.id);
+    erts_dsprintf(dsbufp, "driver %T ", pp ? pp->common.id : NIL);
 }
 
 static void
@@ -1061,8 +1061,8 @@ print_event_op(erts_dsprintf_buf_t *dsbufp,
 		      (unsigned int) event_data->events,
 		      (unsigned int) event_data->revents);
     erts_dsprintf(dsbufp, ") by ");
-    print_driver_name(dsbufp, pp->id);
-    erts_dsprintf(dsbufp, "driver %T ", pp ? pp->id : NIL);
+    print_driver_name(dsbufp, pp->common.id);
+    erts_dsprintf(dsbufp, "driver %T ", pp ? pp->common.id : NIL);
 }
 
 static void
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index f94e0f2296..57ffb9f151 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -1153,7 +1153,7 @@ static int set_driver_data(int port_num,
 	report_exit = erts_alloc(ERTS_ALC_T_PRT_REP_EXIT,
 				 sizeof(ErtsSysReportExit));
 	report_exit->next = report_exit_list;
-	report_exit->port = erts_port[port_num].id;
+	report_exit->port = erts_port[port_num].common.id;
 	report_exit->pid = pid;
 	report_exit->ifd = read_write & DO_READ ? ifd : -1;
 	report_exit->ofd = read_write & DO_WRITE ? ofd : -1;
@@ -2570,7 +2570,7 @@ report_exit_status(ErtsSysReportExit *rep, int status)
 	if (rep->ifd >= 0) {
 	    driver_data[rep->ifd].alive = 0;
 	    driver_data[rep->ifd].status = status;
-	    (void) driver_select((ErlDrvPort) internal_port_index(pp->id),
+	    (void) driver_select((ErlDrvPort) internal_port_index(pp->common.id),
 				 rep->ifd,
 				 (ERL_DRV_READ|ERL_DRV_USE),
 				 1);
@@ -2578,7 +2578,7 @@ report_exit_status(ErtsSysReportExit *rep, int status)
 	if (rep->ofd >= 0) {
 	    driver_data[rep->ofd].alive = 0;
 	    driver_data[rep->ofd].status = status;
-	    (void) driver_select((ErlDrvPort) internal_port_index(pp->id),
+	    (void) driver_select((ErlDrvPort) internal_port_index(pp->common.id),
 				 rep->ofd,
 				 (ERL_DRV_WRITE|ERL_DRV_USE),
 				 1);
-- 
cgit v1.2.3