[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.453 by root, Tue Sep 23 04:29:11 2008 UTC

…		…
19	# The authors can be reached via e-mail to <support@deliantra.net>	19	# The authors can be reached via e-mail to <support@deliantra.net>
20	#	20	#
21		21
22	package cf;	22	package cf;
23		23
		24	use 5.10.0;
24	use utf8;	25	use utf8;
25	use strict;	26	use strict "vars", "subs";
26		27
27	use Symbol;	28	use Symbol;
28	use List::Util;	29	use List::Util;
29	use Socket;	30	use Socket;
30	use EV 3.2;	31	use EV;
31	use Opcode;	32	use Opcode;
32	use Safe;	33	use Safe;
33	use Safe::Hole;	34	use Safe::Hole;
34	use Storable ();	35	use Storable ();
35		36
36	use Coro 4.50 ();	37	use Coro ();
37	use Coro::State;	38	use Coro::State;
38	use Coro::Handle;	39	use Coro::Handle;
39	use Coro::EV;	40	use Coro::EV;
		41	use Coro::AnyEvent;
40	use Coro::Timer;	42	use Coro::Timer;
41	use Coro::Signal;	43	use Coro::Signal;
42	use Coro::Semaphore;	44	use Coro::Semaphore;
		45	use Coro::AnyEvent;
43	use Coro::AIO;	46	use Coro::AIO;
44	use Coro::BDB;	47	use Coro::BDB 1.6;
45	use Coro::Storable;	48	use Coro::Storable;
46	use Coro::Util ();	49	use Coro::Util ();
47		50
48	use JSON::XS 2.01 ();	51	use JSON::XS 2.01 ();
49	use BDB ();	52	use BDB ();
50	use Data::Dumper;	53	use Data::Dumper;
51	use Digest::MD5;	54	use Digest::MD5;
52	use Fcntl;	55	use Fcntl;
53	use YAML ();	56	use YAML ();
54	use IO::AIO 2.51 ();	57	use IO::AIO ();
55	use Time::HiRes;	58	use Time::HiRes;
56	use Compress::LZF;	59	use Compress::LZF;
57	use Digest::MD5 ();	60	use Digest::MD5 ();
		61
		62	AnyEvent::detect;
58		63
59	# configure various modules to our taste	64	# configure various modules to our taste
60	#	65	#
61	$Storable::canonical = 1; # reduce rsync transfers	66	$Storable::canonical = 1; # reduce rsync transfers
62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	67	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		68
		69	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		70
		71	# make sure c-lzf reinitialises itself
		72	Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	73	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66		74
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	75	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		76
69	our %COMMAND = ();	77	our %COMMAND = ();
70	our %COMMAND_TIME = ();	78	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	81	our %EXTCMD = ();
74	our %EXTICMD = ();	82	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	83	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	84	our %EXT_MAP = (); # pluggable maps
77		85
78	our $RELOAD; # number of reloads so far	86	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	87	our @EVENT;
80		88
81	our $CONFDIR = confdir;	89	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	90	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	91	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	92	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	93	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	94	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	95	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	96	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	97	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	98	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	99	our $BDBDIR = "$LOCALDIR/db";
		100	our $PIDFILE = "$LOCALDIR/pid";
		101	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		102
92	our %RESOURCE;	103	our %RESOURCE;
93		104
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	105	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95	our $AIO_POLL_WATCHER;
96	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	106	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	107	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	108	our $USE_FSYNC = 1; # use fsync to write maps - default off
99		109
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	110	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	111	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	112	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	113	our $DB_ENV;
105		114
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	128	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	129	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	130	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	131	our $TICK_START; # for load detecting purposes
123		132
		133	our @POST_INIT;
		134
124	binmode STDOUT;	135	binmode STDOUT;
125	binmode STDERR;	136	binmode STDERR;
126		137
127	# read virtual server time, if available	138	# read virtual server time, if available
128	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	139	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	140	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	141	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	142	$RUNTIME = <$fh> + 0.;
132	}	143	}
133		144
134	mkdir $_	145	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	146	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
242	for my $pkg (qw(	253	for my $pkg (qw(
243	cf::global cf::attachable	254	cf::global cf::attachable
244	cf::object cf::object::player	255	cf::object cf::object::player
245	cf::client cf::player	256	cf::client cf::player
246	cf::arch cf::living	257	cf::arch cf::living
		258	cf::map cf::mapspace
247	cf::map cf::party cf::region	259	cf::party cf::region
248	)) {	260	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	261	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	262	}
252		263
253	$EV::DIED = sub {	264	$EV::DIED = sub {
254	warn "error in event callback: @_";	265	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	307	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		308
298	sub encode_json($) { $json_coder->encode ($_[0]) }	309	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	310	sub decode_json($) { $json_coder->decode ($_[0]) }
300		311
		312	=item cf::post_init { BLOCK }
		313
		314	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		315	but I<before> the server starts ticking again.
		316
		317	The cdoeblock will have a single boolean argument to indicate whether this
		318	is a reload or not.
		319
		320	=cut
		321
		322	sub post_init(&) {
		323	push @POST_INIT, shift;
		324	}
		325
301	=item cf::lock_wait $string	326	=item cf::lock_wait $string
302		327
303	Wait until the given lock is available. See cf::lock_acquire.	328	Wait until the given lock is available. See cf::lock_acquire.
304		329
305	=item my $lock = cf::lock_acquire $string	330	=item my $lock = cf::lock_acquire $string
…		…
332	return;#d#	357	return;#d#
333	}#d#	358	}#d#
334		359
335	# wait for lock, if any	360	# wait for lock, if any
336	while ($LOCK{$key}) {	361	while ($LOCK{$key}) {
		362	#local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337	push @{ $LOCK{$key} }, $Coro::current;	363	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;	364	Coro::schedule;
339	}	365	}
340	}	366	}
341		367
…		…
724		750
725	#############################################################################	751	#############################################################################
726		752
727	=head2 ATTACHABLE OBJECTS	753	=head2 ATTACHABLE OBJECTS
728		754
729	Many objects in crossfire are so-called attachable objects. That means you can	755	Many objects in deliantra are so-called attachable objects. That means you can
730	attach callbacks/event handlers (a collection of which is called an "attachment")	756	attach callbacks/event handlers (a collection of which is called an "attachment")
731	to it. All such attachable objects support the following methods.	757	to it. All such attachable objects support the following methods.
732		758
733	In the following description, CLASS can be any of C<global>, C<object>	759	In the following description, CLASS can be any of C<global>, C<object>
734	C<player>, C<client> or C<map> (i.e. the attachable objects in	760	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
784	=item cf::CLASS::attachment $name, ...	810	=item cf::CLASS::attachment $name, ...
785		811
786	Register an attachment by C<$name> through which attachable objects of the	812	Register an attachment by C<$name> through which attachable objects of the
787	given CLASS can refer to this attachment.	813	given CLASS can refer to this attachment.
788		814
789	Some classes such as crossfire maps and objects can specify attachments	815	Some classes such as deliantra maps and objects can specify attachments
790	that are attached at load/instantiate time, thus the need for a name.	816	that are attached at load/instantiate time, thus the need for a name.
791		817
792	These calls expect any number of the following handler/hook descriptions:	818	These calls expect any number of the following handler/hook descriptions:
793		819
794	=over 4	820	=over 4
…		…
1085		1111
1086	sub reattach {	1112	sub reattach {
1087	# basically do the same as instantiate, without calling instantiate	1113	# basically do the same as instantiate, without calling instantiate
1088	my ($obj) = @_;	1114	my ($obj) = @_;
1089		1115
		1116	# no longer needed after getting rid of delete_package?
1090	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1117	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091		1118
1092	my $registry = $obj->registry;	1119	my $registry = $obj->registry;
1093		1120
1094	@$registry = ();	1121	@$registry = ();
1095		1122
…		…
1141	utf8::decode (my $decname = $filename);	1168	utf8::decode (my $decname = $filename);
1142	warn sprintf "saving %s (%d,%d)\n",	1169	warn sprintf "saving %s (%d,%d)\n",
1143	$decname, length $$rdata, scalar @$objs;	1170	$decname, length $$rdata, scalar @$objs;
1144		1171
1145	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1172	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1146	chmod SAVE_MODE, $fh;	1173	aio_chmod $fh, SAVE_MODE;
1147	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1174	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148	aio_fsync $fh if $cf::USE_FSYNC;	1175	aio_fsync $fh if $cf::USE_FSYNC;
1149	close $fh;	1176	aio_close $fh;
1150		1177
1151	if (@$objs) {	1178	if (@$objs) {
1152	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1179	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1153	chmod SAVE_MODE, $fh;	1180	aio_chmod $fh, SAVE_MODE;
1154	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1181	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155	aio_write $fh, 0, (length $data), $data, 0;	1182	aio_write $fh, 0, (length $data), $data, 0;
1156	aio_fsync $fh if $cf::USE_FSYNC;	1183	aio_fsync $fh if $cf::USE_FSYNC;
1157	close $fh;	1184	aio_close $fh;
1158	aio_rename "$filename.pst~", "$filename.pst";	1185	aio_rename "$filename.pst~", "$filename.pst";
1159	}	1186	}
1160	} else {	1187	} else {
1161	aio_unlink "$filename.pst";	1188	aio_unlink "$filename.pst";
1162	}	1189	}
…		…
1331		1358
1332	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1359	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333	if $source =~ /\A#!.?perl.?#\s(.)$/m;	1360	if $source =~ /\A#!.?perl.?#\s(.)$/m;
1334		1361
1335	$ext{source} =	1362	$ext{source} =
1336	"package $pkg; use strict; use utf8;\n"	1363	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337	. "#line 1 \"$path\"\n{\n"	1364	. "#line 1 \"$path\"\n{\n"
1338	. $source	1365	. $source
1339	. "\n};\n1";	1366	. "\n};\n1";
1340		1367
1341	$todo{$base} = \%ext;	1368	$todo{$base} = \%ext;
…		…
1381		1408
1382	=back	1409	=back
1383		1410
1384	=head2 CORE EXTENSIONS	1411	=head2 CORE EXTENSIONS
1385		1412
1386	Functions and methods that extend core crossfire objects.	1413	Functions and methods that extend core deliantra objects.
1387		1414
1388	=cut	1415	=cut
1389		1416
1390	package cf::player;	1417	package cf::player;
1391		1418
…		…
1434		1461
1435	sub exists($) {	1462	sub exists($) {
1436	my ($login) = @_;	1463	my ($login) = @_;
1437		1464
1438	$cf::PLAYER{$login}	1465	$cf::PLAYER{$login}
1439	or cf::sync_job { !aio_stat path $login }	1466	or !aio_stat path $login
1440	}	1467	}
1441		1468
1442	sub find($) {	1469	sub find($) {
1443	return $cf::PLAYER{$_[0]} \|\| do {	1470	return $cf::PLAYER{$_[0]} \|\| do {
1444	my $login = $_[0];	1471	my $login = $_[0];
…		…
1456	my $f = new_from_file cf::object::thawer path $login	1483	my $f = new_from_file cf::object::thawer path $login
1457	or return;	1484	or return;
1458		1485
1459	my $pl = cf::player::load_pl $f	1486	my $pl = cf::player::load_pl $f
1460	or return;	1487	or return;
		1488
1461	local $cf::PLAYER_LOADING{$login} = $pl;	1489	local $cf::PLAYER_LOADING{$login} = $pl;
1462	$f->resolve_delayed_derefs;	1490	$f->resolve_delayed_derefs;
1463	$cf::PLAYER{$login} = $pl	1491	$cf::PLAYER{$login} = $pl
1464	}	1492	}
1465	}	1493	}
…		…
1518	my ($pl) = @_;	1546	my ($pl) = @_;
1519		1547
1520	my $name = $pl->ob->name;	1548	my $name = $pl->ob->name;
1521		1549
1522	$pl->{deny_save} = 1;	1550	$pl->{deny_save} = 1;
1523	$pl->password ("*"); # this should lock out the player until we nuked the dir	1551	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1524		1552
1525	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1553	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526	$pl->deactivate;	1554	$pl->deactivate;
		1555	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1556	$pl->ob->check_score;
1527	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1557	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1528	$pl->ns->destroy if $pl->ns;	1558	$pl->ns->destroy if $pl->ns;
1529		1559
1530	my $path = playerdir $pl;	1560	my $path = playerdir $pl;
1531	my $temp = "$path~$cf::RUNTIME~deleting~";	1561	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1570		1600
1571	for my $login (@$dirs) {	1601	for my $login (@$dirs) {
1572	my $path = path $login;	1602	my $path = path $login;
1573		1603
1574	# a .pst is a dead give-away for a valid player	1604	# a .pst is a dead give-away for a valid player
1575	unless (-e "$path.pst") {	1605	# if no pst file found, open and chekc for blocked users
		1606	if (aio_stat "$path.pst") {
1576	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1607	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577	aio_read $fh, 0, 512, my $buf, 0 or next;	1608	aio_read $fh, 0, 512, my $buf, 0 or next;
1578	$buf !~ /^password -------------$/m or next; # official not-valid tag	1609	$buf !~ /^password -------------$/m or next; # official not-valid tag
1579	}	1610	}
1580		1611
…		…
1611	}	1642	}
1612		1643
1613	\@paths	1644	\@paths
1614	}	1645	}
1615		1646
1616	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1647	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617		1648
1618	Expand crossfire pod fragments into protocol xml.	1649	Expand deliantra pod fragments into protocol xml.
1619
1620	=cut
1621
1622	use re 'eval';
1623
1624	my $group;
1625	my $interior; $interior = qr{
1626	# match a pod interior sequence sans C<< >>
1627	(?:
1628	\ (.*?)\ (?{ $group = $^N })
1629	\| < (??{$interior}) >
1630	)
1631	}x;
1632
1633	sub expand_cfpod {
1634	my ($self, $pod) = @_;
1635
1636	my $xml;
1637
1638	while () {
1639	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1640	$group = $1;
1641
1642	$group =~ s/&/&/g;
1643	$group =~ s/</</g;
1644
1645	$xml .= $group;
1646	} elsif ($pod =~ m%\G
1647	([BCGHITU])
1648	<
1649	(?:
1650	([^<>]*) (?{ $group = $^N })
1651	\| < $interior >
1652	)
1653	>
1654	%gcsx
1655	) {
1656	my ($code, $data) = ($1, $group);
1657
1658	if ($code eq "B") {
1659	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660	} elsif ($code eq "I") {
1661	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662	} elsif ($code eq "U") {
1663	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664	} elsif ($code eq "C") {
1665	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666	} elsif ($code eq "T") {
1667	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668	} elsif ($code eq "G") {
1669	my ($male, $female) = split /\\|/, $data;
1670	$data = $self->gender ? $female : $male;
1671	$xml .= expand_cfpod ($self, $data);
1672	} elsif ($code eq "H") {
1673	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675	"")
1676	[$self->{hintmode}];
1677	} else {
1678	$xml .= "error processing '$code($data)' directive";
1679	}
1680	} else {
1681	if ($pod =~ /\G(.+)/) {
1682	warn "parse error while expanding $pod (at $1)";
1683	}
1684	last;
1685	}
1686	}
1687
1688	for ($xml) {
1689	# create single paragraphs (very hackish)
1690	s/(?<=\S)\n(?=\w)/ /g;
1691
1692	# compress some whitespace
1693	s/\s+\n/\n/g; # ws line-ends
1694	s/\n\n+/\n/g; # double lines
1695	s/^\n+//; # beginning lines
1696	s/\n+$//; # ending lines
1697	}
1698
1699	$xml
1700	}
1701
1702	no re 'eval';
1703
1704	sub hintmode {
1705	$_[0]{hintmode} = $_[1] if @_ > 1;
1706	$_[0]{hintmode}
1707	}
1708		1650
1709	=item $player->ext_reply ($msgid, @msg)	1651	=item $player->ext_reply ($msgid, @msg)
1710		1652
1711	Sends an ext reply to the player.	1653	Sends an ext reply to the player.
1712		1654
…		…
2029		1971
2030	cf::lock_wait "map_data:$path";#d#remove	1972	cf::lock_wait "map_data:$path";#d#remove
2031	cf::lock_wait "map_find:$path";	1973	cf::lock_wait "map_find:$path";
2032		1974
2033	$cf::MAP{$path} \|\| do {	1975	$cf::MAP{$path} \|\| do {
2034	my $guard1 = cf::lock_acquire "map_find:$path";
2035	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it	1976	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
		1977	my $guard2 = cf::lock_acquire "map_find:$path";
2036		1978
2037	my $map = new_from_path cf::map $path	1979	my $map = new_from_path cf::map $path
2038	or return;	1980	or return;
2039		1981
2040	$map->{last_save} = $cf::RUNTIME;	1982	$map->{last_save} = $cf::RUNTIME;
…		…
2043	or return;	1985	or return;
2044		1986
2045	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1987	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046	# doing this can freeze the server in a sync job, obviously	1988	# doing this can freeze the server in a sync job, obviously
2047	#$cf::WAIT_FOR_TICK->wait;	1989	#$cf::WAIT_FOR_TICK->wait;
		1990	undef $guard2;
2048	undef $guard1;	1991	undef $guard1;
2049	undef $guard2;
2050	$map->reset;	1992	$map->reset;
2051	return find $path;	1993	return find $path;
2052	}	1994	}
2053		1995
2054	$cf::MAP{$path} = $map	1996	$cf::MAP{$path} = $map
…		…
2081	my $f = new_from_file cf::object::thawer $self->{load_path};	2023	my $f = new_from_file cf::object::thawer $self->{load_path};
2082	$f->skip_block;	2024	$f->skip_block;
2083	$self->_load_objects ($f)	2025	$self->_load_objects ($f)
2084	or return;	2026	or return;
2085		2027
2086	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2028	$self->post_load_original
2087	if delete $self->{load_original};	2029	if delete $self->{load_original};
2088		2030
2089	if (my $uniq = $self->uniq_path) {	2031	if (my $uniq = $self->uniq_path) {
2090	utf8::encode $uniq;	2032	utf8::encode $uniq;
2091	unless (aio_stat $uniq) {	2033	unless (aio_stat $uniq) {
…		…
2457	can be C<undef>. Does the right thing when the player is currently in a	2399	can be C<undef>. Does the right thing when the player is currently in a
2458	dialogue with the given NPC character.	2400	dialogue with the given NPC character.
2459		2401
2460	=cut	2402	=cut
2461		2403
		2404	our $SAY_CHANNEL = {
		2405	id => "say",
		2406	title => "Map",
		2407	reply => "say ",
		2408	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2409	};
		2410
		2411	our $CHAT_CHANNEL = {
		2412	id => "chat",
		2413	title => "Chat",
		2414	reply => "chat ",
		2415	tooltip => "Player chat and shouts, global to the server.",
		2416	};
		2417
2462	# rough implementation of a future "reply" method that works	2418	# rough implementation of a future "reply" method that works
2463	# with dialog boxes.	2419	# with dialog boxes.
2464	#TODO: the first argument must go, split into a $npc->reply_to ( method	2420	#TODO: the first argument must go, split into a $npc->reply_to ( method
2465	sub cf::object::player::reply($$$;$) {	2421	sub cf::object::player::reply($$$;$) {
2466	my ($self, $npc, $msg, $flags) = @_;	2422	my ($self, $npc, $msg, $flags) = @_;
…		…
2477	my $dialog = $pl->{npc_dialog};	2433	my $dialog = $pl->{npc_dialog};
2478	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2434	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479		2435
2480	} else {	2436	} else {
2481	$msg = $npc->name . " says: $msg" if $npc;	2437	$msg = $npc->name . " says: $msg" if $npc;
2482	$self->message ($msg, $flags);	2438	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483	}	2439	}
2484	}	2440	}
2485	}	2441	}
2486		2442
2487	=item $object->send_msg ($channel, $msg, $color, [extra...])	2443	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2512		2468
2513	=item $player_object->enter_link	2469	=item $player_object->enter_link
2514		2470
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2471	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2472
2517	The player should be reasonably safe there for short amounts of time. You	2473	The player should be reasonably safe there for short amounts of time (e.g.
2518	I<MUST> call C<leave_link> as soon as possible, though.	2474	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2475	though, as the palyer cannot control the character while it is on the link
		2476	map.
2519		2477
2520	Will never block.	2478	Will never block.
2521		2479
2522	=item $player_object->leave_link ($map, $x, $y)	2480	=item $player_object->leave_link ($map, $x, $y)
2523		2481
…		…
2581		2539
2582	$map->load;	2540	$map->load;
2583	$map->load_neighbours;	2541	$map->load_neighbours;
2584		2542
2585	return unless $self->contr->active;	2543	return unless $self->contr->active;
		2544	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586	$self->activate_recursive;	2545	$self->activate_recursive;
2587		2546
2588	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2547	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589	$self->enter_map ($map, $x, $y);	2548	$self->enter_map ($map, $x, $y);
2590	}	2549	}
…		…
2594	Moves the player to the given map-path and coordinates by first freezing	2553	Moves the player to the given map-path and coordinates by first freezing
2595	her, loading and preparing them map, calling the provided $check callback	2554	her, loading and preparing them map, calling the provided $check callback
2596	that has to return the map if sucecssful, and then unfreezes the player on	2555	that has to return the map if sucecssful, and then unfreezes the player on
2597	the new (success) or old (failed) map position. In either case, $done will	2556	the new (success) or old (failed) map position. In either case, $done will
2598	be called at the end of this process.	2557	be called at the end of this process.
		2558
		2559	Note that $check will be called with a potentially non-loaded map, so if
		2560	it needs a loaded map it has to call C<< ->load >>.
2599		2561
2600	=cut	2562	=cut
2601		2563
2602	our $GOTOGEN;	2564	our $GOTOGEN;
2603		2565
…		…
2682	}	2644	}
2683		2645
2684	sub prepare_random_map {	2646	sub prepare_random_map {
2685	my ($exit) = @_;	2647	my ($exit) = @_;
2686		2648
2687	my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689	# all this does is basically replace the /! path by	2649	# all this does is basically replace the /! path by
2690	# a new random map path (?random/...) with a seed	2650	# a new random map path (?random/...) with a seed
2691	# that depends on the exit object	2651	# that depends on the exit object
2692		2652
2693	my $rmp = parse_random_map_params $exit->msg;	2653	my $rmp = parse_random_map_params $exit->msg;
…		…
2695	if ($exit->map) {	2655	if ($exit->map) {
2696	$rmp->{region} = $exit->region->name;	2656	$rmp->{region} = $exit->region->name;
2697	$rmp->{origin_map} = $exit->map->path;	2657	$rmp->{origin_map} = $exit->map->path;
2698	$rmp->{origin_x} = $exit->x;	2658	$rmp->{origin_x} = $exit->x;
2699	$rmp->{origin_y} = $exit->y;	2659	$rmp->{origin_y} = $exit->y;
		2660
		2661	$exit->map->touch;
2700	}	2662	}
2701		2663
2702	$rmp->{random_seed} \|\|= $exit->random_seed;	2664	$rmp->{random_seed} \|\|= $exit->random_seed;
2703		2665
2704	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);	2666	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
…		…
2708	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2670	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2709	aio_write $fh, 0, (length $data), $data, 0;	2671	aio_write $fh, 0, (length $data), $data, 0;
2710	undef $fh;	2672	undef $fh;
2711	aio_rename "$meta~", $meta;	2673	aio_rename "$meta~", $meta;
2712		2674
		2675	my $slaying = "?random/$md5";
		2676
		2677	if ($exit->valid) {
2713	$exit->slaying ("?random/$md5");	2678	$exit->slaying ("?random/$md5");
2714	$exit->msg (undef);	2679	$exit->msg (undef);
		2680	}
2715	}	2681	}
2716	}	2682	}
2717		2683
2718	sub cf::object::player::enter_exit {	2684	sub cf::object::player::enter_exit {
2719	my ($self, $exit) = @_;	2685	my ($self, $exit) = @_;
2720		2686
2721	return unless $self->type == cf::PLAYER;	2687	return unless $self->type == cf::PLAYER;
2722		2688
2723	if ($exit->slaying eq "/!") {
2724	#TODO: this should de-fi-ni-te-ly not be a sync-job
2725	# the problem is that $exit might not survive long enough
2726	# so it needs to be done right now, right here
2727	cf::sync_job { prepare_random_map $exit };
2728	}
2729
2730	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731	my $hp = $exit->stats->hp;
2732	my $sp = $exit->stats->sp;
2733
2734	$self->enter_link;	2689	$self->enter_link;
2735		2690
2736	# if exit is damned, update players death & WoR home-position
2737	$self->contr->savebed ($slaying, $hp, $sp)
2738	if $exit->flag (FLAG_DAMNED);
2739
2740	(async {	2691	(async {
2741	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2692	$Coro::current->{desc} = "enter_exit";
2742		2693
2743	$self->deactivate_recursive; # just to be sure
2744	unless (eval {	2694	unless (eval {
		2695	$self->deactivate_recursive; # just to be sure
		2696
		2697	# random map handling
		2698	{
		2699	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2700
		2701	prepare_random_map $exit
		2702	if $exit->slaying eq "/!";
		2703	}
		2704
		2705	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2706	my $x = $exit->stats->hp;
		2707	my $y = $exit->stats->sp;
		2708
2745	$self->goto ($slaying, $hp, $sp);	2709	$self->goto ($map, $x, $y);
2746		2710
		2711	# if exit is damned, update players death & WoR home-position
		2712	$self->contr->savebed ($map, $x, $y)
		2713	if $exit->flag (cf::FLAG_DAMNED);
		2714
2747	1;	2715	1
2748	}) {	2716	}) {
2749	$self->message ("Something went wrong deep within the crossfire server. "	2717	$self->message ("Something went wrong deep within the deliantra server. "
2750	. "I'll try to bring you back to the map you were before. "	2718	. "I'll try to bring you back to the map you were before. "
2751	. "Please report this to the dungeon master!",	2719	. "Please report this to the dungeon master!",
2752	cf::NDI_UNIQUE \| cf::NDI_RED);	2720	cf::NDI_UNIQUE \| cf::NDI_RED);
2753		2721
2754	warn "ERROR in enter_exit: $@";	2722	warn "ERROR in enter_exit: $@";
…		…
2820	id => "infobox",	2788	id => "infobox",
2821	title => "Body Parts",	2789	title => "Body Parts",
2822	reply => undef,	2790	reply => undef,
2823	tooltip => "Shows which body parts you posess and are available",	2791	tooltip => "Shows which body parts you posess and are available",
2824	},	2792	},
		2793	"c/skills" => {
		2794	id => "infobox",
		2795	title => "Skills",
		2796	reply => undef,
		2797	tooltip => "Shows your experience per skill and item power",
		2798	},
2825	"c/uptime" => {	2799	"c/uptime" => {
2826	id => "infobox",	2800	id => "infobox",
2827	title => "Uptime",	2801	title => "Uptime",
2828	reply => undef,	2802	reply => undef,
2829	tooltip => "How long the server has been running since last restart",	2803	tooltip => "How long the server has been running since last restart",
…		…
2843	);	2817	);
2844		2818
2845	sub cf::client::send_msg {	2819	sub cf::client::send_msg {
2846	my ($self, $channel, $msg, $color, @extra) = @_;	2820	my ($self, $channel, $msg, $color, @extra) = @_;
2847		2821
2848	$msg = $self->pl->expand_cfpod ($msg);	2822	$msg = $self->pl->expand_cfpod ($msg)
		2823	unless $color & cf::NDI_VERBATIM;
2849		2824
2850	$color &= cf::NDI_CLIENT_MASK; # just in case...	2825	$color &= cf::NDI_CLIENT_MASK; # just in case...
2851		2826
2852	# check predefined channels, for the benefit of C	2827	# check predefined channels, for the benefit of C
2853	if ($CHANNEL{$channel}) {	2828	if ($CHANNEL{$channel}) {
…		…
2874	if ($self->can_msg) {	2849	if ($self->can_msg) {
2875	# default colour, mask it out	2850	# default colour, mask it out
2876	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2851	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2877	if $color & cf::NDI_DEF;	2852	if $color & cf::NDI_DEF;
2878		2853
2879	$self->send_packet ("msg " . $self->{json_coder}->encode (	2854	my $pkt = "msg "
		2855	. $self->{json_coder}->encode (
2880	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2856	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
		2857	);
		2858
		2859	# try lzf for large packets
		2860	$pkt = "lzf " . Compress::LZF::compress $pkt
		2861	if 1024 <= length $pkt and $self->{can_lzf};
		2862
		2863	# split very large packets
		2864	if (8192 < length $pkt and $self->{can_lzf}) {
		2865	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
		2866	$pkt = "frag";
		2867	}
		2868
		2869	$self->send_packet ($pkt);
2881	} else {	2870	} else {
2882	if ($color >= 0) {	2871	if ($color >= 0) {
2883	# replace some tags by gcfclient-compatible ones	2872	# replace some tags by gcfclient-compatible ones
2884	for ($msg) {	2873	for ($msg) {
2885	1 while	2874	1 while
…		…
3099		3088
3100	=cut	3089	=cut
3101		3090
3102	for (	3091	for (
3103	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3092	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3104	insert remove inv name archname title slaying race	3093	insert remove inv nrof name archname title slaying race
3105	decrease split destroy)],	3094	decrease split destroy change_exp)],
3106	["cf::object::player" => qw(player)],	3095	["cf::object::player" => qw(player)],
3107	["cf::player" => qw(peaceful)],	3096	["cf::player" => qw(peaceful)],
3108	["cf::map" => qw(trigger)],	3097	["cf::map" => qw(trigger)],
3109	) {	3098	) {
3110	no strict 'refs';	3099	no strict 'refs';
…		…
3368	reload_treasures;	3357	reload_treasures;
3369		3358
3370	warn "finished reloading resource files\n";	3359	warn "finished reloading resource files\n";
3371	}	3360	}
3372		3361
3373	sub init {
3374	my $guard = freeze_mainloop;
3375
3376	reload_resources;
3377	}
3378
3379	sub reload_config {	3362	sub reload_config {
3380	open my $fh, "<:utf8", "$CONFDIR/config"	3363	open my $fh, "<:utf8", "$CONFDIR/config"
3381	or return;	3364	or return;
3382		3365
3383	local $/;	3366	local $/;
…		…
3395	};	3378	};
3396	warn $@ if $@;	3379	warn $@ if $@;
3397	}	3380	}
3398	}	3381	}
3399		3382
		3383	sub pidfile() {
		3384	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3385	or die "$PIDFILE: $!";
		3386	flock $fh, &Fcntl::LOCK_EX
		3387	or die "$PIDFILE: flock: $!";
		3388	$fh
		3389	}
		3390
		3391	# make sure only one server instance is running at any one time
		3392	sub atomic {
		3393	my $fh = pidfile;
		3394
		3395	my $pid = <$fh>;
		3396	kill 9, $pid if $pid > 0;
		3397
		3398	seek $fh, 0, 0;
		3399	print $fh $$;
		3400	}
		3401
3400	sub main {	3402	sub main {
		3403	cf::init_globals; # initialise logging
		3404
		3405	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3406	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3407	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3408	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3409
		3410	cf::init_experience;
		3411	cf::init_anim;
		3412	cf::init_attackmess;
		3413	cf::init_dynamic;
		3414	cf::init_block;
		3415
		3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3417
3401	# we must not ever block the main coroutine	3418	# we must not ever block the main coroutine
3402	local $Coro::idle = sub {	3419	local $Coro::idle = sub {
3403	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3420	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404	(async {	3421	(async {
3405	$Coro::current->{desc} = "IDLE BUG HANDLER";	3422	$Coro::current->{desc} = "IDLE BUG HANDLER";
3406	EV::loop EV::LOOP_ONESHOT;	3423	EV::loop EV::LOOP_ONESHOT;
3407	})->prio (Coro::PRIO_MAX);	3424	})->prio (Coro::PRIO_MAX);
3408	};	3425	};
3409		3426
3410	{	3427	evthread_start IO::AIO::poll_fileno;
3411	my $guard = freeze_mainloop;	3428
		3429	cf::sync_job {
		3430	reload_resources;
3412	reload_config;	3431	reload_config;
3413	db_init;	3432	db_init;
		3433
		3434	cf::load_settings;
		3435	cf::load_materials;
		3436	cf::init_uuid;
		3437	cf::init_signals;
		3438	cf::init_commands;
		3439	cf::init_skills;
		3440
		3441	cf::init_beforeplay;
		3442
		3443	atomic;
		3444
3414	load_extensions;	3445	load_extensions;
3415		3446
3416	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3447	utime time, time, $RUNTIMEFILE;
3417	evthread_start IO::AIO::poll_fileno;	3448
		3449	# no (long-running) fork's whatsoever before this point(!)
		3450	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3451
		3452	(pop @POST_INIT)->(0) while @POST_INIT;
3418	}	3453	};
3419		3454
3420	EV::loop;	3455	EV::loop;
3421	}	3456	}
3422		3457
3423	#############################################################################	3458	#############################################################################
…		…
3432	};	3467	};
3433	}	3468	}
3434	}	3469	}
3435		3470
3436	sub write_runtime_sync {	3471	sub write_runtime_sync {
3437	my $runtime = "$LOCALDIR/runtime";
3438
3439	# first touch the runtime file to show we are still running:	3472	# first touch the runtime file to show we are still running:
3440	# the fsync below can take a very very long time.	3473	# the fsync below can take a very very long time.
3441		3474
3442	IO::AIO::aio_utime $runtime, undef, undef;	3475	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443		3476
3444	my $guard = cf::lock_acquire "write_runtime";	3477	my $guard = cf::lock_acquire "write_runtime";
3445		3478
3446	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3479	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3447	or return;	3480	or return;
3448		3481
3449	my $value = $cf::RUNTIME + 90 + 10;	3482	my $value = $cf::RUNTIME + 90 + 10;
3450	# 10 is the runtime save interval, for a monotonic clock	3483	# 10 is the runtime save interval, for a monotonic clock
3451	# 60 allows for the watchdog to kill the server.	3484	# 60 allows for the watchdog to kill the server.
…		…
3461	aio_utime $fh, undef, undef;	3494	aio_utime $fh, undef, undef;
3462		3495
3463	close $fh	3496	close $fh
3464	or return;	3497	or return;
3465		3498
3466	aio_rename "$runtime~", $runtime	3499	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467	and return;	3500	and return;
3468		3501
3469	warn "runtime file written.\n";	3502	warn "runtime file written.\n";
3470		3503
3471	1	3504	1
…		…
3555	sub post_cleanup {	3588	sub post_cleanup {
3556	my ($make_core) = @_;	3589	my ($make_core) = @_;
3557		3590
3558	warn Carp::longmess "post_cleanup backtrace"	3591	warn Carp::longmess "post_cleanup backtrace"
3559	if $make_core;	3592	if $make_core;
		3593
		3594	my $fh = pidfile;
		3595	unlink $PIDFILE if <$fh> == $$;
		3596	}
		3597
		3598	# a safer delete_package, copied from Symbol
		3599	sub clear_package($) {
		3600	my $pkg = shift;
		3601
		3602	# expand to full symbol table name if needed
		3603	unless ($pkg =~ /^main::.*::$/) {
		3604	$pkg = "main$pkg" if $pkg =~ /^::/;
		3605	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3606	$pkg .= '::' unless $pkg =~ /::$/;
		3607	}
		3608
		3609	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3610	my $stem_symtab = *{$stem}{HASH};
		3611
		3612	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3613	or return;
		3614
		3615	# clear all symbols
		3616	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3617	for my $name (keys %$leaf_symtab) {
		3618	_gv_clear *{"$pkg$name"};
		3619	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3620	}
		3621	warn "cleared package $pkg\n";#d#
3560	}	3622	}
3561		3623
3562	sub do_reload_perl() {	3624	sub do_reload_perl() {
3563	# can/must only be called in main	3625	# can/must only be called in main
3564	if ($Coro::current != $Coro::main) {	3626	if ($Coro::current != $Coro::main) {
3565	warn "can only reload from main coroutine";	3627	warn "can only reload from main coroutine";
3566	return;	3628	return;
3567	}	3629	}
3568		3630
		3631	return if $RELOAD++;
		3632
		3633	while ($RELOAD) {
3569	warn "reloading...";	3634	warn "reloading...";
3570		3635
3571	warn "entering sync_job";	3636	warn "entering sync_job";
3572		3637
3573	cf::sync_job {	3638	cf::sync_job {
3574	cf::write_runtime_sync; # external watchdog should not bark	3639	cf::write_runtime_sync; # external watchdog should not bark
3575	cf::emergency_save;	3640	cf::emergency_save;
3576	cf::write_runtime_sync; # external watchdog should not bark	3641	cf::write_runtime_sync; # external watchdog should not bark
3577		3642
3578	warn "syncing database to disk";	3643	warn "syncing database to disk";
3579	BDB::db_env_txn_checkpoint $DB_ENV;	3644	BDB::db_env_txn_checkpoint $DB_ENV;
3580		3645
3581	# if anything goes wrong in here, we should simply crash as we already saved	3646	# if anything goes wrong in here, we should simply crash as we already saved
3582		3647
3583	warn "flushing outstanding aio requests";	3648	warn "flushing outstanding aio requests";
3584	for (;;) {
3585	BDB::flush;
3586	IO::AIO::flush;
3587	Coro::cede_notself;
3588	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3649	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3589	warn "iterate...";	3650	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3590	}
3591
3592	++$RELOAD;
3593
3594	warn "cancelling all extension coros";
3595	$_->cancel for values %EXT_CORO;
3596	%EXT_CORO = ();
3597
3598	warn "removing commands";
3599	%COMMAND = ();
3600
3601	warn "removing ext/exti commands";
3602	%EXTCMD = ();
3603	%EXTICMD = ();
3604
3605	warn "unloading/nuking all extensions";
3606	for my $pkg (@EXTS) {
3607	warn "... unloading $pkg";
3608
3609	if (my $cb = $pkg->can ("unload")) {
3610	eval {
3611	$cb->($pkg);
3612	1
3613	} or warn "$pkg unloaded, but with errors: $@";
3614	}	3651	}
3615		3652
3616	warn "... nuking $pkg";	3653	warn "cancelling all extension coros";
3617	Symbol::delete_package $pkg;	3654	$_->cancel for values %EXT_CORO;
3618	}	3655	%EXT_CORO = ();
3619		3656
3620	warn "unloading all perl modules loaded from $LIBDIR";	3657	warn "removing commands";
3621	while (my ($k, $v) = each %INC) {	3658	%COMMAND = ();
3622	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623		3659
		3660	warn "removing ext/exti commands";
		3661	%EXTCMD = ();
		3662	%EXTICMD = ();
		3663
		3664	warn "unloading/nuking all extensions";
		3665	for my $pkg (@EXTS) {
3624	warn "... unloading $k";	3666	warn "... unloading $pkg";
3625	delete $INC{$k};
3626		3667
3627	$k =~ s/\.pm$//;
3628	$k =~ s/\//::/g;
3629
3630	if (my $cb = $k->can ("unload_module")) {	3668	if (my $cb = $pkg->can ("unload")) {
		3669	eval {
3631	$cb->();	3670	$cb->($pkg);
		3671	1
		3672	} or warn "$pkg unloaded, but with errors: $@";
		3673	}
		3674
		3675	warn "... clearing $pkg";
		3676	clear_package $pkg;
3632	}	3677	}
3633		3678
3634	Symbol::delete_package $k;	3679	warn "unloading all perl modules loaded from $LIBDIR";
		3680	while (my ($k, $v) = each %INC) {
		3681	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3682
		3683	warn "... unloading $k";
		3684	delete $INC{$k};
		3685
		3686	$k =~ s/\.pm$//;
		3687	$k =~ s/\//::/g;
		3688
		3689	if (my $cb = $k->can ("unload_module")) {
		3690	$cb->();
		3691	}
		3692
		3693	clear_package $k;
3635	}	3694	}
3636		3695
3637	warn "getting rid of safe::, as good as possible";	3696	warn "getting rid of safe::, as good as possible";
3638	Symbol::delete_package "safe::$_"	3697	clear_package "safe::$_"
3639	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3698	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640		3699
3641	warn "unloading cf.pm \"a bit\"";	3700	warn "unloading cf.pm \"a bit\"";
3642	delete $INC{"cf.pm"};	3701	delete $INC{"cf.pm"};
3643	delete $INC{"cf/pod.pm"};	3702	delete $INC{"cf/pod.pm"};
3644		3703
3645	# don't, removes xs symbols, too,	3704	# don't, removes xs symbols, too,
3646	# and global variables created in xs	3705	# and global variables created in xs
3647	#Symbol::delete_package __PACKAGE__;	3706	#clear_package __PACKAGE__;
3648		3707
3649	warn "unload completed, starting to reload now";	3708	warn "unload completed, starting to reload now";
3650		3709
3651	warn "reloading cf.pm";	3710	warn "reloading cf.pm";
3652	require cf;	3711	require cf;
3653	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3712	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3654		3713
3655	warn "loading config and database again";	3714	warn "loading config and database again";
3656	cf::reload_config;	3715	cf::reload_config;
3657		3716
3658	warn "loading extensions";	3717	warn "loading extensions";
3659	cf::load_extensions;	3718	cf::load_extensions;
3660		3719
3661	warn "reattaching attachments to objects/players";	3720	warn "reattaching attachments to objects/players";
3662	_global_reattach; # objects, sockets	3721	_global_reattach; # objects, sockets
3663	warn "reattaching attachments to maps";	3722	warn "reattaching attachments to maps";
3664	reattach $_ for values %MAP;	3723	reattach $_ for values %MAP;
3665	warn "reattaching attachments to players";	3724	warn "reattaching attachments to players";
3666	reattach $_ for values %PLAYER;	3725	reattach $_ for values %PLAYER;
3667		3726
		3727	warn "running post_load";
		3728	(pop @POST_INIT)->(1) while @POST_INIT;
		3729
3668	warn "leaving sync_job";	3730	warn "leaving sync_job";
3669		3731
3670	1	3732	1
3671	} or do {	3733	} or do {
3672	warn $@;	3734	warn $@;
3673	cf::cleanup "error while reloading, exiting.";	3735	cf::cleanup "error while reloading, exiting.";
3674	};	3736	};
3675		3737
3676	warn "reloaded";	3738	warn "reloaded";
		3739	--$RELOAD;
		3740	}
3677	};	3741	};
3678		3742
3679	our $RELOAD_WATCHER; # used only during reload	3743	our $RELOAD_WATCHER; # used only during reload
3680		3744
3681	sub reload_perl() {	3745	sub reload_perl() {
3682	# doing reload synchronously and two reloads happen back-to-back,	3746	# doing reload synchronously and two reloads happen back-to-back,
3683	# coro crashes during coro_state_free->destroy here.	3747	# coro crashes during coro_state_free->destroy here.
3684		3748
3685	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3749	$RELOAD_WATCHER \|\|= EV::timer $TICK * 1.5, 0, sub {
3686	do_reload_perl;	3750	do_reload_perl;
3687	undef $RELOAD_WATCHER;	3751	undef $RELOAD_WATCHER;
3688	};	3752	};
3689	}	3753	}
3690		3754
…		…
3763	{	3827	{
3764	# configure BDB	3828	# configure BDB
3765		3829
3766	BDB::min_parallel 8;	3830	BDB::min_parallel 8;
3767	BDB::max_poll_reqs $TICK * 0.1;	3831	BDB::max_poll_reqs $TICK * 0.1;
3768	$Coro::BDB::WATCHER->priority (1);	3832	$AnyEvent::BDB::WATCHER->priority (1);
3769		3833
3770	unless ($DB_ENV) {	3834	unless ($DB_ENV) {
3771	$DB_ENV = BDB::db_env_create;	3835	$DB_ENV = BDB::db_env_create;
3772	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3836	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
3773	\| BDB::LOG_AUTOREMOVE, 1);	3837	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3838	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3839	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3840	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776		3841
3777	cf::sync_job {	3842	cf::sync_job {
3778	eval {	3843	eval {
…		…
3804	{	3869	{
3805	# configure IO::AIO	3870	# configure IO::AIO
3806		3871
3807	IO::AIO::min_parallel 8;	3872	IO::AIO::min_parallel 8;
3808	IO::AIO::max_poll_time $TICK * 0.1;	3873	IO::AIO::max_poll_time $TICK * 0.1;
3809	$Coro::AIO::WATCHER->priority (1);	3874	undef $AnyEvent::AIO::WATCHER;
3810	}	3875	}
3811		3876
3812	my $_log_backtrace;	3877	my $_log_backtrace;
3813		3878
3814	sub _log_backtrace {	3879	sub _log_backtrace {
…		…
3817	$msg =~ s/\n//;	3882	$msg =~ s/\n//;
3818		3883
3819	# limit the # of concurrent backtraces	3884	# limit the # of concurrent backtraces
3820	if ($_log_backtrace < 2) {	3885	if ($_log_backtrace < 2) {
3821	++$_log_backtrace;	3886	++$_log_backtrace;
		3887	my $perl_bt = Carp::longmess $msg;
3822	async {	3888	async {
3823	$Coro::current->{desc} = "abt $msg";	3889	$Coro::current->{desc} = "abt $msg";
3824		3890
3825	my @bt = fork_call {	3891	my @bt = fork_call {
3826	@addr = map { sprintf "%x", $_ } @addr;	3892	@addr = map { sprintf "%x", $_ } @addr;
…		…
3837	}	3903	}
3838		3904
3839	@funcs	3905	@funcs
3840	};	3906	};
3841		3907
3842	LOG llevInfo, "[ABT] $msg\n";	3908	LOG llevInfo, "[ABT] $perl_bt\n";
		3909	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843	LOG llevInfo, "[ABT] $_\n" for @bt;	3910	LOG llevInfo, "[ABT] $_\n" for @bt;
3844	--$_log_backtrace;	3911	--$_log_backtrace;
3845	};	3912	};
3846	} else {	3913	} else {
3847	LOG llevInfo, "[ABT] $msg\n";	3914	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.426 by root, Thu Apr 24 04:40:31 2008 UTC vs. Revision 1.453 by root, Tue Sep 23 04:29:11 2008 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.453 by root, Tue Sep 23 04:29:11 2008 UTC