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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 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
…		…
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];
…		…
1519	my ($pl) = @_;	1546	my ($pl) = @_;
1520		1547
1521	my $name = $pl->ob->name;	1548	my $name = $pl->ob->name;
1522		1549
1523	$pl->{deny_save} = 1;	1550	$pl->{deny_save} = 1;
1524	$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
1525		1552
1526	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1553	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527	$pl->deactivate;	1554	$pl->deactivate;
		1555	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1556	$pl->ob->check_score;
1528	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1557	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1529	$pl->ns->destroy if $pl->ns;	1558	$pl->ns->destroy if $pl->ns;
1530		1559
1531	my $path = playerdir $pl;	1560	my $path = playerdir $pl;
1532	my $temp = "$path~$cf::RUNTIME~deleting~";	1561	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1613	}	1642	}
1614		1643
1615	\@paths	1644	\@paths
1616	}	1645	}
1617		1646
1618	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1647	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619		1648
1620	Expand crossfire pod fragments into protocol xml.	1649	Expand deliantra pod fragments into protocol xml.
1621
1622	=cut
1623
1624	use re 'eval';
1625
1626	my $group;
1627	my $interior; $interior = qr{
1628	# match a pod interior sequence sans C<< >>
1629	(?:
1630	\ (.*?)\ (?{ $group = $^N })
1631	\| < (??{$interior}) >
1632	)
1633	}x;
1634
1635	sub expand_cfpod {
1636	my ($self, $pod) = @_;
1637
1638	my $xml;
1639
1640	while () {
1641	if ($pod =~ /\G( (?: [^BCGHITU]+ \| .(?!<) )+ )/xgcs) {
1642	$group = $1;
1643
1644	$group =~ s/&/&/g;
1645	$group =~ s/</</g;
1646
1647	$xml .= $group;
1648	} elsif ($pod =~ m%\G
1649	([BCGHITU])
1650	<
1651	(?:
1652	([^<>]*) (?{ $group = $^N })
1653	\| < $interior >
1654	)
1655	>
1656	%gcsx
1657	) {
1658	my ($code, $data) = ($1, $group);
1659
1660	if ($code eq "B") {
1661	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662	} elsif ($code eq "I") {
1663	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664	} elsif ($code eq "U") {
1665	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666	} elsif ($code eq "C") {
1667	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668	} elsif ($code eq "T") {
1669	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670	} elsif ($code eq "G") {
1671	my ($male, $female) = split /\\|/, $data;
1672	$data = $self->gender ? $female : $male;
1673	$xml .= expand_cfpod ($self, $data);
1674	} elsif ($code eq "H") {
1675	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677	"")
1678	[$self->{hintmode}];
1679	} else {
1680	$xml .= "error processing '$code($data)' directive";
1681	}
1682	} else {
1683	if ($pod =~ /\G(.+)/) {
1684	warn "parse error while expanding $pod (at $1)";
1685	}
1686	last;
1687	}
1688	}
1689
1690	for ($xml) {
1691	# create single paragraphs (very hackish)
1692	s/(?<=\S)\n(?=\w)/ /g;
1693
1694	# compress some whitespace
1695	s/\s+\n/\n/g; # ws line-ends
1696	s/\n\n+/\n/g; # double lines
1697	s/^\n+//; # beginning lines
1698	s/\n+$//; # ending lines
1699	}
1700
1701	$xml
1702	}
1703
1704	no re 'eval';
1705
1706	sub hintmode {
1707	$_[0]{hintmode} = $_[1] if @_ > 1;
1708	$_[0]{hintmode}
1709	}
1710		1650
1711	=item $player->ext_reply ($msgid, @msg)	1651	=item $player->ext_reply ($msgid, @msg)
1712		1652
1713	Sends an ext reply to the player.	1653	Sends an ext reply to the player.
1714		1654
…		…
2031		1971
2032	cf::lock_wait "map_data:$path";#d#remove	1972	cf::lock_wait "map_data:$path";#d#remove
2033	cf::lock_wait "map_find:$path";	1973	cf::lock_wait "map_find:$path";
2034		1974
2035	$cf::MAP{$path} \|\| do {	1975	$cf::MAP{$path} \|\| do {
2036	my $guard1 = cf::lock_acquire "map_find:$path";
2037	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";
2038		1978
2039	my $map = new_from_path cf::map $path	1979	my $map = new_from_path cf::map $path
2040	or return;	1980	or return;
2041		1981
2042	$map->{last_save} = $cf::RUNTIME;	1982	$map->{last_save} = $cf::RUNTIME;
…		…
2045	or return;	1985	or return;
2046		1986
2047	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1987	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048	# doing this can freeze the server in a sync job, obviously	1988	# doing this can freeze the server in a sync job, obviously
2049	#$cf::WAIT_FOR_TICK->wait;	1989	#$cf::WAIT_FOR_TICK->wait;
		1990	undef $guard2;
2050	undef $guard1;	1991	undef $guard1;
2051	undef $guard2;
2052	$map->reset;	1992	$map->reset;
2053	return find $path;	1993	return find $path;
2054	}	1994	}
2055		1995
2056	$cf::MAP{$path} = $map	1996	$cf::MAP{$path} = $map
…		…
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2023	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2024	$f->skip_block;
2085	$self->_load_objects ($f)	2025	$self->_load_objects ($f)
2086	or return;	2026	or return;
2087		2027
2088	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2028	$self->post_load_original
2089	if delete $self->{load_original};	2029	if delete $self->{load_original};
2090		2030
2091	if (my $uniq = $self->uniq_path) {	2031	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2032	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2033	unless (aio_stat $uniq) {
…		…
2459	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
2460	dialogue with the given NPC character.	2400	dialogue with the given NPC character.
2461		2401
2462	=cut	2402	=cut
2463		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
2464	# rough implementation of a future "reply" method that works	2418	# rough implementation of a future "reply" method that works
2465	# with dialog boxes.	2419	# with dialog boxes.
2466	#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
2467	sub cf::object::player::reply($$$;$) {	2421	sub cf::object::player::reply($$$;$) {
2468	my ($self, $npc, $msg, $flags) = @_;	2422	my ($self, $npc, $msg, $flags) = @_;
…		…
2479	my $dialog = $pl->{npc_dialog};	2433	my $dialog = $pl->{npc_dialog};
2480	$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));
2481		2435
2482	} else {	2436	} else {
2483	$msg = $npc->name . " says: $msg" if $npc;	2437	$msg = $npc->name . " says: $msg" if $npc;
2484	$self->message ($msg, $flags);	2438	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485	}	2439	}
2486	}	2440	}
2487	}	2441	}
2488		2442
2489	=item $object->send_msg ($channel, $msg, $color, [extra...])	2443	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2514		2468
2515	=item $player_object->enter_link	2469	=item $player_object->enter_link
2516		2470
2517	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}>).
2518		2472
2519	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.
2520	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.
2521		2477
2522	Will never block.	2478	Will never block.
2523		2479
2524	=item $player_object->leave_link ($map, $x, $y)	2480	=item $player_object->leave_link ($map, $x, $y)
2525		2481
…		…
2583		2539
2584	$map->load;	2540	$map->load;
2585	$map->load_neighbours;	2541	$map->load_neighbours;
2586		2542
2587	return unless $self->contr->active;	2543	return unless $self->contr->active;
		2544	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2588	$self->activate_recursive;	2545	$self->activate_recursive;
2589		2546
2590	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2547	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591	$self->enter_map ($map, $x, $y);	2548	$self->enter_map ($map, $x, $y);
2592	}	2549	}
…		…
2596	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
2597	her, loading and preparing them map, calling the provided $check callback	2554	her, loading and preparing them map, calling the provided $check callback
2598	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
2599	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
2600	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 >>.
2601		2561
2602	=cut	2562	=cut
2603		2563
2604	our $GOTOGEN;	2564	our $GOTOGEN;
2605		2565
…		…
2684	}	2644	}
2685		2645
2686	sub prepare_random_map {	2646	sub prepare_random_map {
2687	my ($exit) = @_;	2647	my ($exit) = @_;
2688		2648
2689	my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691	# all this does is basically replace the /! path by	2649	# all this does is basically replace the /! path by
2692	# a new random map path (?random/...) with a seed	2650	# a new random map path (?random/...) with a seed
2693	# that depends on the exit object	2651	# that depends on the exit object
2694		2652
2695	my $rmp = parse_random_map_params $exit->msg;	2653	my $rmp = parse_random_map_params $exit->msg;
…		…
2697	if ($exit->map) {	2655	if ($exit->map) {
2698	$rmp->{region} = $exit->region->name;	2656	$rmp->{region} = $exit->region->name;
2699	$rmp->{origin_map} = $exit->map->path;	2657	$rmp->{origin_map} = $exit->map->path;
2700	$rmp->{origin_x} = $exit->x;	2658	$rmp->{origin_x} = $exit->x;
2701	$rmp->{origin_y} = $exit->y;	2659	$rmp->{origin_y} = $exit->y;
		2660
		2661	$exit->map->touch;
2702	}	2662	}
2703		2663
2704	$rmp->{random_seed} \|\|= $exit->random_seed;	2664	$rmp->{random_seed} \|\|= $exit->random_seed;
2705		2665
2706	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);	2666	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
…		…
2710	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2670	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
2711	aio_write $fh, 0, (length $data), $data, 0;	2671	aio_write $fh, 0, (length $data), $data, 0;
2712	undef $fh;	2672	undef $fh;
2713	aio_rename "$meta~", $meta;	2673	aio_rename "$meta~", $meta;
2714		2674
		2675	my $slaying = "?random/$md5";
		2676
		2677	if ($exit->valid) {
2715	$exit->slaying ("?random/$md5");	2678	$exit->slaying ("?random/$md5");
2716	$exit->msg (undef);	2679	$exit->msg (undef);
		2680	}
2717	}	2681	}
2718	}	2682	}
2719		2683
2720	sub cf::object::player::enter_exit {	2684	sub cf::object::player::enter_exit {
2721	my ($self, $exit) = @_;	2685	my ($self, $exit) = @_;
2722		2686
2723	return unless $self->type == cf::PLAYER;	2687	return unless $self->type == cf::PLAYER;
2724		2688
2725	if ($exit->slaying eq "/!") {
2726	#TODO: this should de-fi-ni-te-ly not be a sync-job
2727	# the problem is that $exit might not survive long enough
2728	# so it needs to be done right now, right here
2729	cf::sync_job { prepare_random_map $exit };
2730	}
2731
2732	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733	my $hp = $exit->stats->hp;
2734	my $sp = $exit->stats->sp;
2735
2736	$self->enter_link;	2689	$self->enter_link;
2737		2690
2738	# if exit is damned, update players death & WoR home-position
2739	$self->contr->savebed ($slaying, $hp, $sp)
2740	if $exit->flag (FLAG_DAMNED);
2741
2742	(async {	2691	(async {
2743	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2692	$Coro::current->{desc} = "enter_exit";
2744		2693
2745	$self->deactivate_recursive; # just to be sure
2746	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
2747	$self->goto ($slaying, $hp, $sp);	2709	$self->goto ($map, $x, $y);
2748		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
2749	1;	2715	1
2750	}) {	2716	}) {
2751	$self->message ("Something went wrong deep within the crossfire server. "	2717	$self->message ("Something went wrong deep within the deliantra server. "
2752	. "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. "
2753	. "Please report this to the dungeon master!",	2719	. "Please report this to the dungeon master!",
2754	cf::NDI_UNIQUE \| cf::NDI_RED);	2720	cf::NDI_UNIQUE \| cf::NDI_RED);
2755		2721
2756	warn "ERROR in enter_exit: $@";	2722	warn "ERROR in enter_exit: $@";
…		…
2822	id => "infobox",	2788	id => "infobox",
2823	title => "Body Parts",	2789	title => "Body Parts",
2824	reply => undef,	2790	reply => undef,
2825	tooltip => "Shows which body parts you posess and are available",	2791	tooltip => "Shows which body parts you posess and are available",
2826	},	2792	},
		2793	"c/skills" => {
		2794	id => "infobox",
		2795	title => "Skills",
		2796	reply => undef,
		2797	tooltip => "Shows your experience per skill and item power",
		2798	},
2827	"c/uptime" => {	2799	"c/uptime" => {
2828	id => "infobox",	2800	id => "infobox",
2829	title => "Uptime",	2801	title => "Uptime",
2830	reply => undef,	2802	reply => undef,
2831	tooltip => "How long the server has been running since last restart",	2803	tooltip => "How long the server has been running since last restart",
…		…
2845	);	2817	);
2846		2818
2847	sub cf::client::send_msg {	2819	sub cf::client::send_msg {
2848	my ($self, $channel, $msg, $color, @extra) = @_;	2820	my ($self, $channel, $msg, $color, @extra) = @_;
2849		2821
2850	$msg = $self->pl->expand_cfpod ($msg);	2822	$msg = $self->pl->expand_cfpod ($msg)
		2823	unless $color & cf::NDI_VERBATIM;
2851		2824
2852	$color &= cf::NDI_CLIENT_MASK; # just in case...	2825	$color &= cf::NDI_CLIENT_MASK; # just in case...
2853		2826
2854	# check predefined channels, for the benefit of C	2827	# check predefined channels, for the benefit of C
2855	if ($CHANNEL{$channel}) {	2828	if ($CHANNEL{$channel}) {
…		…
2876	if ($self->can_msg) {	2849	if ($self->can_msg) {
2877	# default colour, mask it out	2850	# default colour, mask it out
2878	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2851	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2879	if $color & cf::NDI_DEF;	2852	if $color & cf::NDI_DEF;
2880		2853
2881	$self->send_packet ("msg " . $self->{json_coder}->encode (	2854	my $pkt = "msg "
		2855	. $self->{json_coder}->encode (
2882	[$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);
2883	} else {	2870	} else {
2884	if ($color >= 0) {	2871	if ($color >= 0) {
2885	# replace some tags by gcfclient-compatible ones	2872	# replace some tags by gcfclient-compatible ones
2886	for ($msg) {	2873	for ($msg) {
2887	1 while	2874	1 while
…		…
3101		3088
3102	=cut	3089	=cut
3103		3090
3104	for (	3091	for (
3105	["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
3106	insert remove inv name archname title slaying race	3093	insert remove inv nrof name archname title slaying race
3107	decrease split destroy)],	3094	decrease split destroy change_exp)],
3108	["cf::object::player" => qw(player)],	3095	["cf::object::player" => qw(player)],
3109	["cf::player" => qw(peaceful)],	3096	["cf::player" => qw(peaceful)],
3110	["cf::map" => qw(trigger)],	3097	["cf::map" => qw(trigger)],
3111	) {	3098	) {
3112	no strict 'refs';	3099	no strict 'refs';
…		…
3370	reload_treasures;	3357	reload_treasures;
3371		3358
3372	warn "finished reloading resource files\n";	3359	warn "finished reloading resource files\n";
3373	}	3360	}
3374		3361
3375	sub init {
3376	my $guard = freeze_mainloop;
3377
3378	reload_resources;
3379	}
3380
3381	sub reload_config {	3362	sub reload_config {
3382	open my $fh, "<:utf8", "$CONFDIR/config"	3363	open my $fh, "<:utf8", "$CONFDIR/config"
3383	or return;	3364	or return;
3384		3365
3385	local $/;	3366	local $/;
…		…
3397	};	3378	};
3398	warn $@ if $@;	3379	warn $@ if $@;
3399	}	3380	}
3400	}	3381	}
3401		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
3402	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
3403	# we must not ever block the main coroutine	3418	# we must not ever block the main coroutine
3404	local $Coro::idle = sub {	3419	local $Coro::idle = sub {
3405	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#
3406	(async {	3421	(async {
3407	$Coro::current->{desc} = "IDLE BUG HANDLER";	3422	$Coro::current->{desc} = "IDLE BUG HANDLER";
3408	EV::loop EV::LOOP_ONESHOT;	3423	EV::loop EV::LOOP_ONESHOT;
3409	})->prio (Coro::PRIO_MAX);	3424	})->prio (Coro::PRIO_MAX);
3410	};	3425	};
3411		3426
3412	{	3427	evthread_start IO::AIO::poll_fileno;
3413	my $guard = freeze_mainloop;	3428
		3429	cf::sync_job {
		3430	reload_resources;
3414	reload_config;	3431	reload_config;
3415	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
3416	load_extensions;	3445	load_extensions;
3417		3446
3418	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3447	utime time, time, $RUNTIMEFILE;
3419	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;
3420	}	3453	};
3421		3454
3422	EV::loop;	3455	EV::loop;
3423	}	3456	}
3424		3457
3425	#############################################################################	3458	#############################################################################
…		…
3434	};	3467	};
3435	}	3468	}
3436	}	3469	}
3437		3470
3438	sub write_runtime_sync {	3471	sub write_runtime_sync {
3439	my $runtime = "$LOCALDIR/runtime";
3440
3441	# first touch the runtime file to show we are still running:	3472	# first touch the runtime file to show we are still running:
3442	# the fsync below can take a very very long time.	3473	# the fsync below can take a very very long time.
3443		3474
3444	IO::AIO::aio_utime $runtime, undef, undef;	3475	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445		3476
3446	my $guard = cf::lock_acquire "write_runtime";	3477	my $guard = cf::lock_acquire "write_runtime";
3447		3478
3448	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3479	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3449	or return;	3480	or return;
3450		3481
3451	my $value = $cf::RUNTIME + 90 + 10;	3482	my $value = $cf::RUNTIME + 90 + 10;
3452	# 10 is the runtime save interval, for a monotonic clock	3483	# 10 is the runtime save interval, for a monotonic clock
3453	# 60 allows for the watchdog to kill the server.	3484	# 60 allows for the watchdog to kill the server.
…		…
3463	aio_utime $fh, undef, undef;	3494	aio_utime $fh, undef, undef;
3464		3495
3465	close $fh	3496	close $fh
3466	or return;	3497	or return;
3467		3498
3468	aio_rename "$runtime~", $runtime	3499	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469	and return;	3500	and return;
3470		3501
3471	warn "runtime file written.\n";	3502	warn "runtime file written.\n";
3472		3503
3473	1	3504	1
…		…
3485	my $uuid = "$LOCALDIR/uuid";	3516	my $uuid = "$LOCALDIR/uuid";
3486		3517
3487	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3518	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3488	or return;	3519	or return;
3489		3520
3490	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3521	my $value = uuid_seq uuid_cur;
		3522
		3523	if ($value < 1024) {
		3524	warn "cowardly refusing to write low uuid value ($value)!\n";
		3525	return;
		3526	}
		3527
		3528	my $value = uuid_str $value + $uuid_skip;
3491	$uuid_skip = 0;	3529	$uuid_skip = 0;
3492		3530
3493	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3531	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3494	and return;	3532	and return;
3495		3533
…		…
3557	sub post_cleanup {	3595	sub post_cleanup {
3558	my ($make_core) = @_;	3596	my ($make_core) = @_;
3559		3597
3560	warn Carp::longmess "post_cleanup backtrace"	3598	warn Carp::longmess "post_cleanup backtrace"
3561	if $make_core;	3599	if $make_core;
		3600
		3601	my $fh = pidfile;
		3602	unlink $PIDFILE if <$fh> == $$;
		3603	}
		3604
		3605	# a safer delete_package, copied from Symbol
		3606	sub clear_package($) {
		3607	my $pkg = shift;
		3608
		3609	# expand to full symbol table name if needed
		3610	unless ($pkg =~ /^main::.*::$/) {
		3611	$pkg = "main$pkg" if $pkg =~ /^::/;
		3612	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3613	$pkg .= '::' unless $pkg =~ /::$/;
		3614	}
		3615
		3616	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3617	my $stem_symtab = *{$stem}{HASH};
		3618
		3619	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3620	or return;
		3621
		3622	# clear all symbols
		3623	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3624	for my $name (keys %$leaf_symtab) {
		3625	_gv_clear *{"$pkg$name"};
		3626	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3627	}
		3628	warn "cleared package $pkg\n";#d#
3562	}	3629	}
3563		3630
3564	sub do_reload_perl() {	3631	sub do_reload_perl() {
3565	# can/must only be called in main	3632	# can/must only be called in main
3566	if ($Coro::current != $Coro::main) {	3633	if ($Coro::current != $Coro::main) {
3567	warn "can only reload from main coroutine";	3634	warn "can only reload from main coroutine";
3568	return;	3635	return;
3569	}	3636	}
3570		3637
		3638	return if $RELOAD++;
		3639
		3640	while ($RELOAD) {
3571	warn "reloading...";	3641	warn "reloading...";
3572		3642
3573	warn "entering sync_job";	3643	warn "entering sync_job";
3574		3644
3575	cf::sync_job {	3645	cf::sync_job {
3576	cf::write_runtime_sync; # external watchdog should not bark	3646	cf::write_runtime_sync; # external watchdog should not bark
3577	cf::emergency_save;	3647	cf::emergency_save;
3578	cf::write_runtime_sync; # external watchdog should not bark	3648	cf::write_runtime_sync; # external watchdog should not bark
3579		3649
3580	warn "syncing database to disk";	3650	warn "syncing database to disk";
3581	BDB::db_env_txn_checkpoint $DB_ENV;	3651	BDB::db_env_txn_checkpoint $DB_ENV;
3582		3652
3583	# if anything goes wrong in here, we should simply crash as we already saved	3653	# if anything goes wrong in here, we should simply crash as we already saved
3584		3654
3585	warn "flushing outstanding aio requests";	3655	warn "flushing outstanding aio requests";
3586	for (;;) {
3587	BDB::flush;
3588	IO::AIO::flush;
3589	Coro::cede_notself;
3590	last unless IO::AIO::nreqs \|\| BDB::nreqs;	3656	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3591	warn "iterate...";	3657	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592	}
3593
3594	++$RELOAD;
3595
3596	warn "cancelling all extension coros";
3597	$_->cancel for values %EXT_CORO;
3598	%EXT_CORO = ();
3599
3600	warn "removing commands";
3601	%COMMAND = ();
3602
3603	warn "removing ext/exti commands";
3604	%EXTCMD = ();
3605	%EXTICMD = ();
3606
3607	warn "unloading/nuking all extensions";
3608	for my $pkg (@EXTS) {
3609	warn "... unloading $pkg";
3610
3611	if (my $cb = $pkg->can ("unload")) {
3612	eval {
3613	$cb->($pkg);
3614	1
3615	} or warn "$pkg unloaded, but with errors: $@";
3616	}	3658	}
3617		3659
3618	warn "... nuking $pkg";	3660	warn "cancelling all extension coros";
3619	Symbol::delete_package $pkg;	3661	$_->cancel for values %EXT_CORO;
3620	}	3662	%EXT_CORO = ();
3621		3663
3622	warn "unloading all perl modules loaded from $LIBDIR";	3664	warn "removing commands";
3623	while (my ($k, $v) = each %INC) {	3665	%COMMAND = ();
3624	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625		3666
		3667	warn "removing ext/exti commands";
		3668	%EXTCMD = ();
		3669	%EXTICMD = ();
		3670
		3671	warn "unloading/nuking all extensions";
		3672	for my $pkg (@EXTS) {
3626	warn "... unloading $k";	3673	warn "... unloading $pkg";
3627	delete $INC{$k};
3628		3674
3629	$k =~ s/\.pm$//;
3630	$k =~ s/\//::/g;
3631
3632	if (my $cb = $k->can ("unload_module")) {	3675	if (my $cb = $pkg->can ("unload")) {
		3676	eval {
3633	$cb->();	3677	$cb->($pkg);
		3678	1
		3679	} or warn "$pkg unloaded, but with errors: $@";
		3680	}
		3681
		3682	warn "... clearing $pkg";
		3683	clear_package $pkg;
3634	}	3684	}
3635		3685
3636	Symbol::delete_package $k;	3686	warn "unloading all perl modules loaded from $LIBDIR";
		3687	while (my ($k, $v) = each %INC) {
		3688	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3689
		3690	warn "... unloading $k";
		3691	delete $INC{$k};
		3692
		3693	$k =~ s/\.pm$//;
		3694	$k =~ s/\//::/g;
		3695
		3696	if (my $cb = $k->can ("unload_module")) {
		3697	$cb->();
		3698	}
		3699
		3700	clear_package $k;
3637	}	3701	}
3638		3702
3639	warn "getting rid of safe::, as good as possible";	3703	warn "getting rid of safe::, as good as possible";
3640	Symbol::delete_package "safe::$_"	3704	clear_package "safe::$_"
3641	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3705	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642		3706
3643	warn "unloading cf.pm \"a bit\"";	3707	warn "unloading cf.pm \"a bit\"";
3644	delete $INC{"cf.pm"};	3708	delete $INC{"cf.pm"};
3645	delete $INC{"cf/pod.pm"};	3709	delete $INC{"cf/pod.pm"};
3646		3710
3647	# don't, removes xs symbols, too,	3711	# don't, removes xs symbols, too,
3648	# and global variables created in xs	3712	# and global variables created in xs
3649	#Symbol::delete_package __PACKAGE__;	3713	#clear_package __PACKAGE__;
3650		3714
3651	warn "unload completed, starting to reload now";	3715	warn "unload completed, starting to reload now";
3652		3716
3653	warn "reloading cf.pm";	3717	warn "reloading cf.pm";
3654	require cf;	3718	require cf;
3655	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3719	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3656		3720
3657	warn "loading config and database again";	3721	warn "loading config and database again";
3658	cf::reload_config;	3722	cf::reload_config;
3659		3723
3660	warn "loading extensions";	3724	warn "loading extensions";
3661	cf::load_extensions;	3725	cf::load_extensions;
3662		3726
3663	warn "reattaching attachments to objects/players";	3727	warn "reattaching attachments to objects/players";
3664	_global_reattach; # objects, sockets	3728	_global_reattach; # objects, sockets
3665	warn "reattaching attachments to maps";	3729	warn "reattaching attachments to maps";
3666	reattach $_ for values %MAP;	3730	reattach $_ for values %MAP;
3667	warn "reattaching attachments to players";	3731	warn "reattaching attachments to players";
3668	reattach $_ for values %PLAYER;	3732	reattach $_ for values %PLAYER;
3669		3733
		3734	warn "running post_load";
		3735	(pop @POST_INIT)->(1) while @POST_INIT;
		3736
3670	warn "leaving sync_job";	3737	warn "leaving sync_job";
3671		3738
3672	1	3739	1
3673	} or do {	3740	} or do {
3674	warn $@;	3741	warn $@;
3675	cf::cleanup "error while reloading, exiting.";	3742	cf::cleanup "error while reloading, exiting.";
3676	};	3743	};
3677		3744
3678	warn "reloaded";	3745	warn "reloaded";
		3746	--$RELOAD;
		3747	}
3679	};	3748	};
3680		3749
3681	our $RELOAD_WATCHER; # used only during reload	3750	our $RELOAD_WATCHER; # used only during reload
3682		3751
3683	sub reload_perl() {	3752	sub reload_perl() {
3684	# doing reload synchronously and two reloads happen back-to-back,	3753	# doing reload synchronously and two reloads happen back-to-back,
3685	# coro crashes during coro_state_free->destroy here.	3754	# coro crashes during coro_state_free->destroy here.
3686		3755
3687	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3756	$RELOAD_WATCHER \|\|= EV::timer $TICK * 1.5, 0, sub {
3688	do_reload_perl;	3757	do_reload_perl;
3689	undef $RELOAD_WATCHER;	3758	undef $RELOAD_WATCHER;
3690	};	3759	};
3691	}	3760	}
3692		3761
…		…
3765	{	3834	{
3766	# configure BDB	3835	# configure BDB
3767		3836
3768	BDB::min_parallel 8;	3837	BDB::min_parallel 8;
3769	BDB::max_poll_reqs $TICK * 0.1;	3838	BDB::max_poll_reqs $TICK * 0.1;
3770	$Coro::BDB::WATCHER->priority (1);	3839	$AnyEvent::BDB::WATCHER->priority (1);
3771		3840
3772	unless ($DB_ENV) {	3841	unless ($DB_ENV) {
3773	$DB_ENV = BDB::db_env_create;	3842	$DB_ENV = BDB::db_env_create;
3774	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC	3843	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
3775	\| BDB::LOG_AUTOREMOVE, 1);	3844	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3845	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3846	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3847	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778		3848
3779	cf::sync_job {	3849	cf::sync_job {
3780	eval {	3850	eval {
…		…
3806	{	3876	{
3807	# configure IO::AIO	3877	# configure IO::AIO
3808		3878
3809	IO::AIO::min_parallel 8;	3879	IO::AIO::min_parallel 8;
3810	IO::AIO::max_poll_time $TICK * 0.1;	3880	IO::AIO::max_poll_time $TICK * 0.1;
3811	$Coro::AIO::WATCHER->priority (1);	3881	undef $AnyEvent::AIO::WATCHER;
3812	}	3882	}
3813		3883
3814	my $_log_backtrace;	3884	my $_log_backtrace;
3815		3885
3816	sub _log_backtrace {	3886	sub _log_backtrace {
…		…
3819	$msg =~ s/\n//;	3889	$msg =~ s/\n//;
3820		3890
3821	# limit the # of concurrent backtraces	3891	# limit the # of concurrent backtraces
3822	if ($_log_backtrace < 2) {	3892	if ($_log_backtrace < 2) {
3823	++$_log_backtrace;	3893	++$_log_backtrace;
		3894	my $perl_bt = Carp::longmess $msg;
3824	async {	3895	async {
3825	$Coro::current->{desc} = "abt $msg";	3896	$Coro::current->{desc} = "abt $msg";
3826		3897
3827	my @bt = fork_call {	3898	my @bt = fork_call {
3828	@addr = map { sprintf "%x", $_ } @addr;	3899	@addr = map { sprintf "%x", $_ } @addr;
…		…
3839	}	3910	}
3840		3911
3841	@funcs	3912	@funcs
3842	};	3913	};
3843		3914
3844	LOG llevInfo, "[ABT] $msg\n";	3915	LOG llevInfo, "[ABT] $perl_bt\n";
		3916	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845	LOG llevInfo, "[ABT] $_\n" for @bt;	3917	LOG llevInfo, "[ABT] $_\n" for @bt;
3846	--$_log_backtrace;	3918	--$_log_backtrace;
3847	};	3919	};
3848	} else {	3920	} else {
3849	LOG llevInfo, "[ABT] $msg\n";	3921	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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs. Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC