diff options
Diffstat (limited to 'tools/regression/geom')
-rw-r--r-- | tools/regression/geom/GLib/Makefile | 4 | ||||
-rw-r--r-- | tools/regression/geom/Test/T013/ref.conf | 260 | ||||
-rw-r--r-- | tools/regression/geom/Test/T013/testprg.c | 1 | ||||
-rw-r--r-- | tools/regression/geom/Test/T014/ref.conf | 140 | ||||
-rw-r--r-- | tools/regression/geom/geom_sim.h | 5 |
5 files changed, 207 insertions, 203 deletions
diff --git a/tools/regression/geom/GLib/Makefile b/tools/regression/geom/GLib/Makefile index 758cf67..cfa8d04 100644 --- a/tools/regression/geom/GLib/Makefile +++ b/tools/regression/geom/GLib/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ LIB= G -SRCS= geom.c geom_bsd.c geom_simdev.c geom_dump.c geom_event.c geom_io.c \ +SRCS= geom.c geom_aes.c geom_bsd.c geom_simdev.c geom_dump.c \ + geom_event.c geom_gpt.c \ + geom_io.c \ geom_kernsim.c geom_mbr.c geom_simdisk.c geom_enc.c \ geom_simdisk_xml.c geom_slice.c geom_subr.c subr_sbuf.c \ geom_sunlabel.c geom_pc98.c diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf index 0fb60b1..675034a 100644 --- a/tools/regression/geom/Test/T013/ref.conf +++ b/tools/regression/geom/Test/T013/ref.conf @@ -1,225 +1,225 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x80724a0"> + <class id="0x8080720"> <name>DEV-class</name> - <geom id="0x80bee80"> - <class ref="0x80724a0"/> + <geom id="0x80b8e80"> + <class ref="0x8080720"/> <name>da2c</name> <rank>3</rank> - <consumer id="0x80b84c0"> - <geom ref="0x80bee80"/> - <provider ref="0x80be000"/> + <consumer id="0x80b0b40"> + <geom ref="0x80b8e80"/> + <provider ref="0x80b8000"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bed00"> - <class ref="0x80724a0"/> + <geom id="0x80b8d00"> + <class ref="0x8080720"/> <name>da2b</name> <rank>3</rank> - <consumer id="0x80b8480"> - <geom ref="0x80bed00"/> - <provider ref="0x80b9f80"/> + <consumer id="0x80b0b00"> + <geom ref="0x80b8d00"/> + <provider ref="0x80aff80"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80beb80"> - <class ref="0x80724a0"/> + <geom id="0x80b8b80"> + <class ref="0x8080720"/> <name>da2a</name> <rank>3</rank> - <consumer id="0x80b8440"> - <geom ref="0x80beb80"/> - <provider ref="0x80b9f00"/> + <consumer id="0x80b0a00"> + <geom ref="0x80b8b80"/> + <provider ref="0x80aff00"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bea00"> - <class ref="0x80724a0"/> + <geom id="0x80b8a00"> + <class ref="0x8080720"/> <name>da1f</name> <rank>3</rank> - <consumer id="0x80b8400"> - <geom ref="0x80bea00"/> - <provider ref="0x80b9c00"/> + <consumer id="0x80b09c0"> + <geom ref="0x80b8a00"/> + <provider ref="0x80afc80"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be880"> - <class ref="0x80724a0"/> + <geom id="0x80b8880"> + <class ref="0x8080720"/> <name>da1e</name> <rank>3</rank> - <consumer id="0x80b83c0"> - <geom ref="0x80be880"/> - <provider ref="0x80b9b80"/> + <consumer id="0x80b0980"> + <geom ref="0x80b8880"/> + <provider ref="0x80afc00"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be700"> - <class ref="0x80724a0"/> + <geom id="0x80b8700"> + <class ref="0x8080720"/> <name>da1c</name> <rank>3</rank> - <consumer id="0x80b8380"> - <geom ref="0x80be700"/> - <provider ref="0x80b9b00"/> + <consumer id="0x80b0940"> + <geom ref="0x80b8700"/> + <provider ref="0x80afb80"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be580"> - <class ref="0x80724a0"/> + <geom id="0x80b8580"> + <class ref="0x8080720"/> <name>da1b</name> <rank>3</rank> - <consumer id="0x80b8340"> - <geom ref="0x80be580"/> - <provider ref="0x80b9a80"/> + <consumer id="0x80b0900"> + <geom ref="0x80b8580"/> + <provider ref="0x80afb00"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be400"> - <class ref="0x80724a0"/> + <geom id="0x80b8400"> + <class ref="0x8080720"/> <name>da1a</name> <rank>3</rank> - <consumer id="0x80b8300"> - <geom ref="0x80be400"/> - <provider ref="0x80b9a00"/> + <consumer id="0x80b0800"> + <geom ref="0x80b8400"/> + <provider ref="0x80afa80"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be280"> - <class ref="0x80724a0"/> + <geom id="0x80b8280"> + <class ref="0x8080720"/> <name>da0c</name> <rank>3</rank> - <consumer id="0x80b82c0"> - <geom ref="0x80be280"/> - <provider ref="0x80b9700"/> + <consumer id="0x80b07c0"> + <geom ref="0x80b8280"/> + <provider ref="0x80af800"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be100"> - <class ref="0x80724a0"/> + <geom id="0x80b8100"> + <class ref="0x8080720"/> <name>da0b</name> <rank>3</rank> - <consumer id="0x80b8280"> - <geom ref="0x80be100"/> - <provider ref="0x80b9680"/> + <consumer id="0x80b0780"> + <geom ref="0x80b8100"/> + <provider ref="0x80af780"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80be080"> - <class ref="0x80724a0"/> + <geom id="0x80b8080"> + <class ref="0x8080720"/> <name>da0a</name> <rank>3</rank> - <consumer id="0x80b8240"> - <geom ref="0x80be080"/> - <provider ref="0x80b9600"/> + <consumer id="0x80b0640"> + <geom ref="0x80b8080"/> + <provider ref="0x80af700"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80b9c80"> - <class ref="0x80724a0"/> + <geom id="0x80afd00"> + <class ref="0x8080720"/> <name>da2</name> <rank>2</rank> - <consumer id="0x80b81c0"> - <geom ref="0x80b9c80"/> - <provider ref="0x80b9280"/> + <consumer id="0x80b05c0"> + <geom ref="0x80afd00"/> + <provider ref="0x80af400"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80b9780"> - <class ref="0x80724a0"/> + <geom id="0x80af880"> + <class ref="0x8080720"/> <name>da1</name> <rank>2</rank> - <consumer id="0x80b8140"> - <geom ref="0x80b9780"/> - <provider ref="0x80b9180"/> + <consumer id="0x80b0540"> + <geom ref="0x80af880"/> + <provider ref="0x80af300"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80b9300"> - <class ref="0x80724a0"/> + <geom id="0x80af480"> + <class ref="0x8080720"/> <name>da0</name> <rank>2</rank> - <consumer id="0x80b80c0"> - <geom ref="0x80b9300"/> - <provider ref="0x80b9080"/> + <consumer id="0x80b0680"> + <geom ref="0x80af480"/> + <provider ref="0x80af200"/> <mode>r0w0e0</mode> </consumer> </geom> </class> - <class id="0x8072480"> + <class id="0x8080700"> <name>MBREXT</name> </class> - <class id="0x8072460"> + <class id="0x80806e0"> <name>MBR</name> </class> - <class id="0x80724c0"> + <class id="0x8080740"> <name>BSD</name> - <geom id="0x80b9d00"> - <class ref="0x80724c0"/> + <geom id="0x80afd80"> + <class ref="0x8080740"/> <name>da2</name> <rank>2</rank> <config> <labeloffset>64</labeloffset> <frontstuff>8192</frontstuff> </config> - <consumer id="0x80b8200"> - <geom ref="0x80b9d00"/> - <provider ref="0x80b9280"/> + <consumer id="0x80b0ac0"> + <geom ref="0x80afd80"/> + <provider ref="0x80af400"/> <mode>r0w0e0</mode> <config> </config> </consumer> - <provider id="0x80be000"> - <geom ref="0x80b9d00"/> + <provider id="0x80b8000"> + <geom ref="0x80afd80"/> <mode>r0w0e0</mode> <name>da2c</name> <config> <index>2</index> <length>74027520</length> <seclength>144585</seclength> - <offset>0</offset> - <secoffset>0</secoffset> + <offset>4211343360</offset> + <secoffset>8225280</secoffset> </config> </provider> - <provider id="0x80b9f80"> - <geom ref="0x80b9d00"/> + <provider id="0x80aff80"> + <geom ref="0x80afd80"/> <mode>r0w0e0</mode> <name>da2b</name> <config> <index>1</index> <length>4178442240</length> <seclength>8161020</seclength> - <offset>2194844813312</offset> - <secoffset>4286806276</secoffset> + <offset>32901120</offset> + <secoffset>64260</secoffset> </config> </provider> - <provider id="0x80b9f00"> - <geom ref="0x80b9d00"/> + <provider id="0x80aff00"> + <geom ref="0x80afd80"/> <mode>r0w0e0</mode> <name>da2a</name> <config> <index>0</index> <length>24675840</length> <seclength>48195</seclength> - <offset>2194820137472</offset> - <secoffset>4286758081</secoffset> + <offset>8225280</offset> + <secoffset>16065</secoffset> </config> </provider> </geom> - <geom id="0x80b9800"> - <class ref="0x80724c0"/> + <geom id="0x80af900"> + <class ref="0x8080740"/> <name>da1</name> <rank>2</rank> <config> <labeloffset>64</labeloffset> <frontstuff>8192</frontstuff> </config> - <consumer id="0x80b8180"> - <geom ref="0x80b9800"/> - <provider ref="0x80b9180"/> + <consumer id="0x80b08c0"> + <geom ref="0x80af900"/> + <provider ref="0x80af300"/> <mode>r0w0e0</mode> <config> </config> </consumer> - <provider id="0x80b9c00"> - <geom ref="0x80b9800"/> + <provider id="0x80afc80"> + <geom ref="0x80af900"/> <mode>r0w0e0</mode> <name>da1f</name> <config> @@ -230,8 +230,8 @@ <secoffset>2654144</secoffset> </config> </provider> - <provider id="0x80b9b80"> - <geom ref="0x80b9800"/> + <provider id="0x80afc00"> + <geom ref="0x80af900"/> <mode>r0w0e0</mode> <name>da1e</name> <config> @@ -242,8 +242,8 @@ <secoffset>2613184</secoffset> </config> </provider> - <provider id="0x80b9b00"> - <geom ref="0x80b9800"/> + <provider id="0x80afb80"> + <geom ref="0x80af900"/> <mode>r0w0e0</mode> <name>da1c</name> <config> @@ -254,8 +254,8 @@ <secoffset>0</secoffset> </config> </provider> - <provider id="0x80b9a80"> - <geom ref="0x80b9800"/> + <provider id="0x80afb00"> + <geom ref="0x80af900"/> <mode>r0w0e0</mode> <name>da1b</name> <config> @@ -266,8 +266,8 @@ <secoffset>491520</secoffset> </config> </provider> - <provider id="0x80b9a00"> - <geom ref="0x80b9800"/> + <provider id="0x80afa80"> + <geom ref="0x80af900"/> <mode>r0w0e0</mode> <name>da1a</name> <config> @@ -279,23 +279,23 @@ </config> </provider> </geom> - <geom id="0x80b9380"> - <class ref="0x80724c0"/> + <geom id="0x80af500"> + <class ref="0x8080740"/> <name>da0</name> <rank>2</rank> <config> <labeloffset>64</labeloffset> <frontstuff>8192</frontstuff> </config> - <consumer id="0x80b8100"> - <geom ref="0x80b9380"/> - <provider ref="0x80b9080"/> + <consumer id="0x80b0740"> + <geom ref="0x80af500"/> + <provider ref="0x80af200"/> <mode>r0w0e0</mode> <config> </config> </consumer> - <provider id="0x80b9700"> - <geom ref="0x80b9380"/> + <provider id="0x80af800"> + <geom ref="0x80af500"/> <mode>r0w0e0</mode> <name>da0c</name> <config> @@ -306,8 +306,8 @@ <secoffset>0</secoffset> </config> </provider> - <provider id="0x80b9680"> - <geom ref="0x80b9380"/> + <provider id="0x80af780"> + <geom ref="0x80af500"/> <mode>r0w0e0</mode> <name>da0b</name> <config> @@ -318,8 +318,8 @@ <secoffset>7938048</secoffset> </config> </provider> - <provider id="0x80b9600"> - <geom ref="0x80b9380"/> + <provider id="0x80af700"> + <geom ref="0x80af500"/> <mode>r0w0e0</mode> <name>da0a</name> <config> @@ -332,34 +332,34 @@ </provider> </geom> </class> - <class id="0x80723c0"> + <class id="0x8080640"> <name>SIMDISK-class</name> - <geom id="0x80b9200"> - <class ref="0x80723c0"/> + <geom id="0x80af380"> + <class ref="0x8080640"/> <name>da2</name> <rank>1</rank> - <provider id="0x80b9280"> - <geom ref="0x80b9200"/> + <provider id="0x80af400"> + <geom ref="0x80af380"/> <mode>r0w0e0</mode> <name>da2</name> </provider> </geom> - <geom id="0x80b9100"> - <class ref="0x80723c0"/> + <geom id="0x80af280"> + <class ref="0x8080640"/> <name>da1</name> <rank>1</rank> - <provider id="0x80b9180"> - <geom ref="0x80b9100"/> + <provider id="0x80af300"> + <geom ref="0x80af280"/> <mode>r0w0e0</mode> <name>da1</name> </provider> </geom> - <geom id="0x80b9000"> - <class ref="0x80723c0"/> + <geom id="0x80af180"> + <class ref="0x8080640"/> <name>da0</name> <rank>1</rank> - <provider id="0x80b9080"> - <geom ref="0x80b9000"/> + <provider id="0x80af200"> + <geom ref="0x80af180"/> <mode>r0w0e0</mode> <name>da0</name> </provider> diff --git a/tools/regression/geom/Test/T013/testprg.c b/tools/regression/geom/Test/T013/testprg.c index f538a30..d014161 100644 --- a/tools/regression/geom/Test/T013/testprg.c +++ b/tools/regression/geom/Test/T013/testprg.c @@ -69,4 +69,3 @@ thread_sim(void *ptr __unused) done(); return (0); } - diff --git a/tools/regression/geom/Test/T014/ref.conf b/tools/regression/geom/Test/T014/ref.conf index 9f7d978..168a3ef 100644 --- a/tools/regression/geom/Test/T014/ref.conf +++ b/tools/regression/geom/Test/T014/ref.conf @@ -1,136 +1,136 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x8072fa0"> + <class id="0x8081340"> <name>DEV-class</name> - <geom id="0x80bce80"> - <class ref="0x8072fa0"/> + <geom id="0x80aff80"> + <class ref="0x8081340"/> <name>wd0s1f</name> <rank>4</rank> - <consumer id="0x80b9240"> - <geom ref="0x80bce80"/> - <provider ref="0x80bc900"/> + <consumer id="0x80b0900"> + <geom ref="0x80aff80"/> + <provider ref="0x80afa00"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bcd00"> - <class ref="0x8072fa0"/> + <geom id="0x80afe00"> + <class ref="0x8081340"/> <name>wd0s1e</name> <rank>4</rank> - <consumer id="0x80b9200"> - <geom ref="0x80bcd00"/> - <provider ref="0x80bc880"/> + <consumer id="0x80b08c0"> + <geom ref="0x80afe00"/> + <provider ref="0x80af980"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bcb80"> - <class ref="0x8072fa0"/> + <geom id="0x80afc80"> + <class ref="0x8081340"/> <name>wd0s1c</name> <rank>4</rank> - <consumer id="0x80b91c0"> - <geom ref="0x80bcb80"/> - <provider ref="0x80bc800"/> + <consumer id="0x80b0880"> + <geom ref="0x80afc80"/> + <provider ref="0x80af900"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bca00"> - <class ref="0x8072fa0"/> + <geom id="0x80afb00"> + <class ref="0x8081340"/> <name>wd0s1b</name> <rank>4</rank> - <consumer id="0x80b9180"> - <geom ref="0x80bca00"/> - <provider ref="0x80bc780"/> + <consumer id="0x80b0840"> + <geom ref="0x80afb00"/> + <provider ref="0x80af880"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bc980"> - <class ref="0x8072fa0"/> + <geom id="0x80afa80"> + <class ref="0x8081340"/> <name>wd0s1a</name> <rank>4</rank> - <consumer id="0x80b9140"> - <geom ref="0x80bc980"/> - <provider ref="0x80bc700"/> + <consumer id="0x80b0640"> + <geom ref="0x80afa80"/> + <provider ref="0x80af800"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bc300"> - <class ref="0x8072fa0"/> + <geom id="0x80af480"> + <class ref="0x8081340"/> <name>wd0s1</name> <rank>3</rank> - <consumer id="0x80b90c0"> - <geom ref="0x80bc300"/> - <provider ref="0x80bc280"/> + <consumer id="0x80b0540"> + <geom ref="0x80af480"/> + <provider ref="0x80af400"/> <mode>r0w0e0</mode> </consumer> </geom> - <geom id="0x80bc100"> - <class ref="0x8072fa0"/> + <geom id="0x80af280"> + <class ref="0x8081340"/> <name>wd0</name> <rank>2</rank> - <consumer id="0x80b9040"> - <geom ref="0x80bc100"/> - <provider ref="0x80bc080"/> + <consumer id="0x80b0580"> + <geom ref="0x80af280"/> + <provider ref="0x80af200"/> <mode>r0w0e0</mode> </consumer> </geom> </class> - <class id="0x8072e80"> + <class id="0x8081220"> <name>PC98</name> - <geom id="0x80bc180"> - <class ref="0x8072e80"/> + <geom id="0x80af300"> + <class ref="0x8081220"/> <name>wd0</name> <rank>2</rank> <config> <frontstuff>8704</frontstuff> </config> - <consumer id="0x80b9080"> - <geom ref="0x80bc180"/> - <provider ref="0x80bc080"/> + <consumer id="0x80b0600"> + <geom ref="0x80af300"/> + <provider ref="0x80af200"/> <mode>r0w0e0</mode> <config> </config> </consumer> - <provider id="0x80bc280"> - <geom ref="0x80bc180"/> + <provider id="0x80af400"> + <geom ref="0x80af300"/> <mode>r0w0e0</mode> <name>wd0s1</name> <config> <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> + <length>1626603520</length> + <seclength>3176960</seclength> <offset>69632</offset> <secoffset>136</secoffset> </config> </provider> </geom> </class> - <class id="0x8072ea0"> + <class id="0x8081240"> <name>SUN</name> </class> - <class id="0x8072f80"> + <class id="0x8081320"> <name>MBREXT</name> </class> - <class id="0x8072f60"> + <class id="0x8081300"> <name>MBR</name> </class> - <class id="0x8072fc0"> + <class id="0x8081360"> <name>BSD</name> - <geom id="0x80bc480"> - <class ref="0x8072fc0"/> + <geom id="0x80af600"> + <class ref="0x8081360"/> <name>wd0s1</name> <rank>3</rank> <config> <labeloffset>512</labeloffset> <frontstuff>8192</frontstuff> </config> - <consumer id="0x80b9100"> - <geom ref="0x80bc480"/> - <provider ref="0x80bc280"/> + <consumer id="0x80b0800"> + <geom ref="0x80af600"/> + <provider ref="0x80af400"/> <mode>r0w0e0</mode> <config> </config> </consumer> - <provider id="0x80bc900"> - <geom ref="0x80bc480"/> + <provider id="0x80afa00"> + <geom ref="0x80af600"/> <mode>r0w0e0</mode> <name>wd0s1f</name> <config> @@ -141,8 +141,8 @@ <secoffset>460800</secoffset> </config> </provider> - <provider id="0x80bc880"> - <geom ref="0x80bc480"/> + <provider id="0x80af980"> + <geom ref="0x80af600"/> <mode>r0w0e0</mode> <name>wd0s1e</name> <config> @@ -153,8 +153,8 @@ <secoffset>358400</secoffset> </config> </provider> - <provider id="0x80bc800"> - <geom ref="0x80bc480"/> + <provider id="0x80af900"> + <geom ref="0x80af600"/> <mode>r0w0e0</mode> <name>wd0s1c</name> <config> @@ -165,8 +165,8 @@ <secoffset>0</secoffset> </config> </provider> - <provider id="0x80bc780"> - <geom ref="0x80bc480"/> + <provider id="0x80af880"> + <geom ref="0x80af600"/> <mode>r0w0e0</mode> <name>wd0s1b</name> <config> @@ -177,8 +177,8 @@ <secoffset>153600</secoffset> </config> </provider> - <provider id="0x80bc700"> - <geom ref="0x80bc480"/> + <provider id="0x80af800"> + <geom ref="0x80af600"/> <mode>r0w0e0</mode> <name>wd0s1a</name> <config> @@ -191,14 +191,14 @@ </provider> </geom> </class> - <class id="0x8072ec0"> + <class id="0x8081260"> <name>SIMDISK-class</name> - <geom id="0x80bc000"> - <class ref="0x8072ec0"/> + <geom id="0x80af180"> + <class ref="0x8081260"/> <name>wd0</name> <rank>1</rank> - <provider id="0x80bc080"> - <geom ref="0x80bc000"/> + <provider id="0x80af200"> + <geom ref="0x80af180"/> <mode>r0w0e0</mode> <name>wd0</name> </provider> diff --git a/tools/regression/geom/geom_sim.h b/tools/regression/geom/geom_sim.h index 6ea0470..56a5be8 100644 --- a/tools/regression/geom/geom_sim.h +++ b/tools/regression/geom/geom_sim.h @@ -40,6 +40,8 @@ pthread_cond_t ptc_up, ptc_down, ptc_event; pthread_mutex_t ptm_up, ptm_down, ptm_event; +#define CTASSERT(foo) + /* bio.h */ struct bio { @@ -102,7 +104,8 @@ void new_thread(void *(*func)(void *arg), char *name); extern int bootverbose; #define KASSERT(cond, txt) do {if (!(cond)) {printf txt; conff("err"); abort();}} while(0) #define M_WAITOK 0 -#define M_ZERO 1 +#define M_NOWAIT 1 +#define M_ZERO 2 extern struct mtx Giant; void *g_malloc(int size, int flags); |