ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 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
		37	use Guard ();
36	use Coro 4.50 ();	38	use Coro ();
37	use Coro::State;	39	use Coro::State;
38	use Coro::Handle;	40	use Coro::Handle;
39	use Coro::EV;	41	use Coro::EV;
		42	use Coro::AnyEvent;
40	use Coro::Timer;	43	use Coro::Timer;
41	use Coro::Signal;	44	use Coro::Signal;
42	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
		47	use Coro::AnyEvent;
43	use Coro::AIO;	48	use Coro::AIO;
44	use Coro::BDB;	49	use Coro::BDB 1.6;
45	use Coro::Storable;	50	use Coro::Storable;
46	use Coro::Util ();	51	use Coro::Util ();
47		52
48	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
49	use BDB ();	54	use BDB ();
50	use Data::Dumper;	55	use Data::Dumper;
51	use Digest::MD5;	56	use Digest::MD5;
52	use Fcntl;	57	use Fcntl;
53	use YAML ();	58	use YAML ();
54	use IO::AIO 2.51 ();	59	use IO::AIO ();
55	use Time::HiRes;	60	use Time::HiRes;
56	use Compress::LZF;	61	use Compress::LZF;
57	use Digest::MD5 ();	62	use Digest::MD5 ();
		63
		64	AnyEvent::detect;
58		65
59	# configure various modules to our taste	66	# configure various modules to our taste
60	#	67	#
61	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
62	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	69	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
		70
		71	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		72
		73	# make sure c-lzf reinitialises itself
		74	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	75	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		76
67	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	77	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68		78
69	our %COMMAND = ();	79	our %COMMAND = ();
70	our %COMMAND_TIME = ();	80	our %COMMAND_TIME = ();
…		…
73	our %EXTCMD = ();	83	our %EXTCMD = ();
74	our %EXTICMD = ();	84	our %EXTICMD = ();
75	our %EXT_CORO = (); # coroutines bound to extensions	85	our %EXT_CORO = (); # coroutines bound to extensions
76	our %EXT_MAP = (); # pluggable maps	86	our %EXT_MAP = (); # pluggable maps
77		87
78	our $RELOAD; # number of reloads so far	88	our $RELOAD; # number of reloads so far, non-zero while in reload
79	our @EVENT;	89	our @EVENT;
80		90
81	our $CONFDIR = confdir;	91	our $CONFDIR = confdir;
82	our $DATADIR = datadir;	92	our $DATADIR = datadir;
83	our $LIBDIR = "$DATADIR/ext";	93	our $LIBDIR = "$DATADIR/ext";
84	our $PODDIR = "$DATADIR/pod";	94	our $PODDIR = "$DATADIR/pod";
85	our $MAPDIR = "$DATADIR/" . mapdir;	95	our $MAPDIR = "$DATADIR/" . mapdir;
86	our $LOCALDIR = localdir;	96	our $LOCALDIR = localdir;
87	our $TMPDIR = "$LOCALDIR/" . tmpdir;	97	our $TMPDIR = "$LOCALDIR/" . tmpdir;
88	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	98	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	99	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90	our $RANDOMDIR = "$LOCALDIR/random";	100	our $RANDOMDIR = "$LOCALDIR/random";
91	our $BDBDIR = "$LOCALDIR/db";	101	our $BDBDIR = "$LOCALDIR/db";
		102	our $PIDFILE = "$LOCALDIR/pid";
		103	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		104
92	our %RESOURCE;	105	our %RESOURCE;
93		106
94	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	107	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	108	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97	our $NEXT_TICK;	109	our $NEXT_TICK;
98	our $USE_FSYNC = 1; # use fsync to write maps - default off	110	our $USE_FSYNC = 1; # use fsync to write maps - default off
99		111
100	our $BDB_POLL_WATCHER;
101	our $BDB_DEADLOCK_WATCHER;	112	our $BDB_DEADLOCK_WATCHER;
102	our $BDB_CHECKPOINT_WATCHER;	113	our $BDB_CHECKPOINT_WATCHER;
103	our $BDB_TRICKLE_WATCHER;	114	our $BDB_TRICKLE_WATCHER;
104	our $DB_ENV;	115	our $DB_ENV;
105		116
…		…
119	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	130	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120	our $LOADAVG; # same thing, but with alpha-smoothing	131	our $LOADAVG; # same thing, but with alpha-smoothing
121	our $JITTER; # average jitter	132	our $JITTER; # average jitter
122	our $TICK_START; # for load detecting purposes	133	our $TICK_START; # for load detecting purposes
123		134
		135	our @POST_INIT;
		136
		137	our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
		138
124	binmode STDOUT;	139	binmode STDOUT;
125	binmode STDERR;	140	binmode STDERR;
126		141
127	# read virtual server time, if available	142	# read virtual server time, if available
128	unless ($RUNTIME || !-e "$LOCALDIR/runtime") {	143	unless ($RUNTIME || !-e $RUNTIMEFILE) {
129	open my $fh, "<", "$LOCALDIR/runtime"	144	open my $fh, "<", $RUNTIMEFILE
130	or die "unable to read runtime file: $!";	145	or die "unable to read $RUNTIMEFILE file: $!";
131	$RUNTIME = <$fh> + 0.;	146	$RUNTIME = <$fh> + 0.;
132	}	147	}
133		148
134	mkdir $_	149	mkdir $_
135	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	150	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
…		…
242	for my $pkg (qw(	257	for my $pkg (qw(
243	cf::global cf::attachable	258	cf::global cf::attachable
244	cf::object cf::object::player	259	cf::object cf::object::player
245	cf::client cf::player	260	cf::client cf::player
246	cf::arch cf::living	261	cf::arch cf::living
		262	cf::map cf::mapspace
247	cf::map cf::party cf::region	263	cf::party cf::region
248	)) {	264	)) {
249	no strict 'refs';
250	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	265	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251	}	266	}
252		267
253	$EV::DIED = sub {	268	$EV::DIED = sub {
254	warn "error in event callback: @_";	269	warn "error in event callback: @_";
…		…
296	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	311	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297		312
298	sub encode_json($) { $json_coder->encode ($_[0]) }	313	sub encode_json($) { $json_coder->encode ($_[0]) }
299	sub decode_json($) { $json_coder->decode ($_[0]) }	314	sub decode_json($) { $json_coder->decode ($_[0]) }
300		315
		316	=item cf::post_init { BLOCK }
		317
		318	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		319	but I<before> the server starts ticking again.
		320
		321	The cdoeblock will have a single boolean argument to indicate whether this
		322	is a reload or not.
		323
		324	=cut
		325
		326	sub post_init(&) {
		327	push @POST_INIT, shift;
		328	}
		329
301	=item cf::lock_wait $string	330	=item cf::lock_wait $string
302		331
303	Wait until the given lock is available. See cf::lock_acquire.	332	Wait until the given lock is available. See cf::lock_acquire.
304		333
305	=item my $lock = cf::lock_acquire $string	334	=item my $lock = cf::lock_acquire $string
306		335
307	Wait until the given lock is available and then acquires it and returns	336	Wait until the given lock is available and then acquires it and returns
308	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	337	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309	for example when the coroutine gets canceled), the lock is automatically	338	for example when the coroutine gets canceled), the lock is automatically
310	returned.	339	returned.
311		340
312	Locks are *not* recursive, locking from the same coro twice results in a	341	Locks are *not* recursive, locking from the same coro twice results in a
313	deadlocked coro.	342	deadlocked coro.
…		…
319		348
320	Return true if the lock is currently active, i.e. somebody has locked it.	349	Return true if the lock is currently active, i.e. somebody has locked it.
321		350
322	=cut	351	=cut
323		352
324	our %LOCK;	353	our $LOCKS = new Coro::SemaphoreSet;
325	our %LOCKER;#d#
326		354
327	sub lock_wait($) {	355	sub lock_wait($) {
328	my ($key) = @_;	356	$LOCKS->wait ($_[0]);
329
330	if ($LOCKER{$key} == $Coro::current) {#d#
331	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332	return;#d#
333	}#d#
334
335	# wait for lock, if any
336	while ($LOCK{$key}) {
337	push @{ $LOCK{$key} }, $Coro::current;
338	Coro::schedule;
339	}
340	}	357	}
341		358
342	sub lock_acquire($) {	359	sub lock_acquire($) {
343	my ($key) = @_;	360	$LOCKS->guard ($_[0])
344
345	# wait, to be sure we are not locked
346	lock_wait $key;
347
348	$LOCK{$key} = [];
349	$LOCKER{$key} = $Coro::current;#d#
350
351	Coro::guard {
352	delete $LOCKER{$key};#d#
353	# wake up all waiters, to be on the safe side
354	$_->ready for @{ delete $LOCK{$key} };
355	}
356	}	361	}
357		362
358	sub lock_active($) {	363	sub lock_active($) {
359	my ($key) = @_;	364	$LOCKS->count ($_[0]) < 1
360
361	! ! $LOCK{$key}
362	}	365	}
363		366
364	sub freeze_mainloop {	367	sub freeze_mainloop {
365	tick_inhibit_inc;	368	tick_inhibit_inc;
366		369
367	Coro::guard \&tick_inhibit_dec;	370	&Guard::guard (\&tick_inhibit_dec);
368	}	371	}
369		372
370	=item cf::periodic $interval, $cb	373	=item cf::periodic $interval, $cb
371		374
372	Like EV::periodic, but randomly selects a starting point so that the actions	375	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
427	}	430	}
428	}	431	}
429	};	432	};
430		433
431	sub get_slot($;$$) {	434	sub get_slot($;$$) {
		435	return if tick_inhibit || $Coro::current == $Coro::main;
		436
432	my ($time, $pri, $name) = @_;	437	my ($time, $pri, $name) = @_;
433		438
434	$time = $TICK * .6 if $time > $TICK * .6;	439	$time = $TICK * .6 if $time > $TICK * .6;
435	my $sig = new Coro::Signal;	440	my $sig = new Coro::Signal;
436		441
…		…
722		727
723	#############################################################################	728	#############################################################################
724		729
725	=head2 ATTACHABLE OBJECTS	730	=head2 ATTACHABLE OBJECTS
726		731
727	Many objects in crossfire are so-called attachable objects. That means you can	732	Many objects in deliantra are so-called attachable objects. That means you can
728	attach callbacks/event handlers (a collection of which is called an "attachment")	733	attach callbacks/event handlers (a collection of which is called an "attachment")
729	to it. All such attachable objects support the following methods.	734	to it. All such attachable objects support the following methods.
730		735
731	In the following description, CLASS can be any of C<global>, C<object>	736	In the following description, CLASS can be any of C<global>, C<object>
732	C<player>, C<client> or C<map> (i.e. the attachable objects in	737	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
782	=item cf::CLASS::attachment $name, ...	787	=item cf::CLASS::attachment $name, ...
783		788
784	Register an attachment by C<$name> through which attachable objects of the	789	Register an attachment by C<$name> through which attachable objects of the
785	given CLASS can refer to this attachment.	790	given CLASS can refer to this attachment.
786		791
787	Some classes such as crossfire maps and objects can specify attachments	792	Some classes such as deliantra maps and objects can specify attachments
788	that are attached at load/instantiate time, thus the need for a name.	793	that are attached at load/instantiate time, thus the need for a name.
789		794
790	These calls expect any number of the following handler/hook descriptions:	795	These calls expect any number of the following handler/hook descriptions:
791		796
792	=over 4	797	=over 4
…		…
1083		1088
1084	sub reattach {	1089	sub reattach {
1085	# basically do the same as instantiate, without calling instantiate	1090	# basically do the same as instantiate, without calling instantiate
1086	my ($obj) = @_;	1091	my ($obj) = @_;
1087		1092
		1093	# no longer needed after getting rid of delete_package?
1088	bless $obj, ref $obj; # re-bless in case extensions have been reloaded	1094	#bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089		1095
1090	my $registry = $obj->registry;	1096	my $registry = $obj->registry;
1091		1097
1092	@$registry = ();	1098	@$registry = ();
1093		1099
…		…
1139	utf8::decode (my $decname = $filename);	1145	utf8::decode (my $decname = $filename);
1140	warn sprintf "saving %s (%d,%d)\n",	1146	warn sprintf "saving %s (%d,%d)\n",
1141	$decname, length $$rdata, scalar @$objs;	1147	$decname, length $$rdata, scalar @$objs;
1142		1148
1143	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1149	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144	chmod SAVE_MODE, $fh;	1150	aio_chmod $fh, SAVE_MODE;
1145	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1151	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146	aio_fsync $fh if $cf::USE_FSYNC;	1152	aio_fsync $fh if $cf::USE_FSYNC;
1147	close $fh;	1153	aio_close $fh;
1148		1154
1149	if (@$objs) {	1155	if (@$objs) {
1150	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {	1156	if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151	chmod SAVE_MODE, $fh;	1157	aio_chmod $fh, SAVE_MODE;
1152	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1158	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153	aio_write $fh, 0, (length $data), $data, 0;	1159	aio_write $fh, 0, (length $data), $data, 0;
1154	aio_fsync $fh if $cf::USE_FSYNC;	1160	aio_fsync $fh if $cf::USE_FSYNC;
1155	close $fh;	1161	aio_close $fh;
1156	aio_rename "$filename.pst~", "$filename.pst";	1162	aio_rename "$filename.pst~", "$filename.pst";
1157	}	1163	}
1158	} else {	1164	} else {
1159	aio_unlink "$filename.pst";	1165	aio_unlink "$filename.pst";
1160	}	1166	}
1161		1167
1162	aio_rename "$filename~", $filename;	1168	aio_rename "$filename~", $filename;
		1169
		1170	$filename =~ s%/[^/]+$%%;
		1171	aio_pathsync $filename if $cf::USE_FSYNC;
1163	} else {	1172	} else {
1164	warn "FATAL: $filename~: $!\n";	1173	warn "unable to save objects: $filename~: $!\n";
1165	}	1174	}
1166	} else {	1175	} else {
1167	aio_unlink $filename;	1176	aio_unlink $filename;
1168	aio_unlink "$filename.pst";	1177	aio_unlink "$filename.pst";
1169	}	1178	}
…		…
1260	my ($name, $cb) = @_;	1269	my ($name, $cb) = @_;
1261		1270
1262	$EXTICMD{$name} = $cb;	1271	$EXTICMD{$name} = $cb;
1263	}	1272	}
1264		1273
		1274	use File::Glob ();
		1275
1265	cf::player->attach (	1276	cf::player->attach (
1266	on_command => sub {	1277	on_command => sub {
1267	my ($pl, $name, $params) = @_;	1278	my ($pl, $name, $params) = @_;
1268		1279
1269	my $cb = $COMMAND{$name}	1280	my $cb = $COMMAND{$name}
…		…
1301		1312
1302	cf::override;	1313	cf::override;
1303	},	1314	},
1304	);	1315	);
1305		1316
		1317	# "readahead" all extensions
		1318	sub cache_extensions {
		1319	my $grp = IO::AIO::aio_group;
		1320
		1321	add $grp IO::AIO::aio_readdir $LIBDIR, sub {
		1322	for (grep /\.ext$/, @{$_[0]}) {
		1323	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1324	}
		1325	};
		1326
		1327	$grp
		1328	}
		1329
1306	sub load_extensions {	1330	sub load_extensions {
1307	cf::sync_job {	1331	cf::sync_job {
1308	my %todo;	1332	my %todo;
1309		1333
1310	for my $path (<$LIBDIR/*.ext>) {	1334	for my $path (<$LIBDIR/*.ext>) {
…		…
1329		1353
1330	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1354	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1355	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332		1356
1333	$ext{source} =	1357	$ext{source} =
1334	"package $pkg; use strict; use utf8;\n"	1358	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335	. "#line 1 \"$path\"\n{\n"	1359	. "#line 1 \"$path\"\n{\n"
1336	. $source	1360	. $source
1337	. "\n};\n1";	1361	. "\n};\n1";
1338		1362
1339	$todo{$base} = \%ext;	1363	$todo{$base} = \%ext;
…		…
1379		1403
1380	=back	1404	=back
1381		1405
1382	=head2 CORE EXTENSIONS	1406	=head2 CORE EXTENSIONS
1383		1407
1384	Functions and methods that extend core crossfire objects.	1408	Functions and methods that extend core deliantra objects.
1385		1409
1386	=cut	1410	=cut
1387		1411
1388	package cf::player;	1412	package cf::player;
1389		1413
…		…
1432		1456
1433	sub exists($) {	1457	sub exists($) {
1434	my ($login) = @_;	1458	my ($login) = @_;
1435		1459
1436	$cf::PLAYER{$login}	1460	$cf::PLAYER{$login}
1437	or cf::sync_job { !aio_stat path $login }	1461	or !aio_stat path $login
1438	}	1462	}
1439		1463
1440	sub find($) {	1464	sub find($) {
1441	return $cf::PLAYER{$_[0]} || do {	1465	return $cf::PLAYER{$_[0]} || do {
1442	my $login = $_[0];	1466	my $login = $_[0];
…		…
1454	my $f = new_from_file cf::object::thawer path $login	1478	my $f = new_from_file cf::object::thawer path $login
1455	or return;	1479	or return;
1456		1480
1457	my $pl = cf::player::load_pl $f	1481	my $pl = cf::player::load_pl $f
1458	or return;	1482	or return;
		1483
1459	local $cf::PLAYER_LOADING{$login} = $pl;	1484	local $cf::PLAYER_LOADING{$login} = $pl;
1460	$f->resolve_delayed_derefs;	1485	$f->resolve_delayed_derefs;
1461	$cf::PLAYER{$login} = $pl	1486	$cf::PLAYER{$login} = $pl
1462	}	1487	}
1463	}	1488	}
…		…
1473		1498
1474	return if $pl->{deny_save};	1499	return if $pl->{deny_save};
1475		1500
1476	aio_mkdir playerdir $pl, 0770;	1501	aio_mkdir playerdir $pl, 0770;
1477	$pl->{last_save} = $cf::RUNTIME;	1502	$pl->{last_save} = $cf::RUNTIME;
		1503
		1504	cf::get_slot 0.01;
1478		1505
1479	$pl->save_pl ($path);	1506	$pl->save_pl ($path);
1480	cf::cede_to_tick;	1507	cf::cede_to_tick;
1481	}	1508	}
1482		1509
…		…
1514	my ($pl) = @_;	1541	my ($pl) = @_;
1515		1542
1516	my $name = $pl->ob->name;	1543	my $name = $pl->ob->name;
1517		1544
1518	$pl->{deny_save} = 1;	1545	$pl->{deny_save} = 1;
1519	$pl->password ("*"); # this should lock out the player until we nuked the dir	1546	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1520		1547
1521	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1548	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522	$pl->deactivate;	1549	$pl->deactivate;
		1550	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1551	$pl->ob->check_score;
1523	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1552	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1524	$pl->ns->destroy if $pl->ns;	1553	$pl->ns->destroy if $pl->ns;
1525		1554
1526	my $path = playerdir $pl;	1555	my $path = playerdir $pl;
1527	my $temp = "$path~$cf::RUNTIME~deleting~";	1556	my $temp = "$path~$cf::RUNTIME~deleting~";
…		…
1566		1595
1567	for my $login (@$dirs) {	1596	for my $login (@$dirs) {
1568	my $path = path $login;	1597	my $path = path $login;
1569		1598
1570	# a .pst is a dead give-away for a valid player	1599	# a .pst is a dead give-away for a valid player
1571	unless (-e "$path.pst") {	1600	# if no pst file found, open and chekc for blocked users
		1601	if (aio_stat "$path.pst") {
1572	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;	1602	my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573	aio_read $fh, 0, 512, my $buf, 0 or next;	1603	aio_read $fh, 0, 512, my $buf, 0 or next;
1574	$buf !~ /^password -------------$/m or next; # official not-valid tag	1604	$buf !~ /^password -------------$/m or next; # official not-valid tag
1575	}	1605	}
1576		1606
…		…
1607	}	1637	}
1608		1638
1609	\@paths	1639	\@paths
1610	}	1640	}
1611		1641
1612	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1642	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613		1643
1614	Expand crossfire pod fragments into protocol xml.	1644	Expand deliantra pod fragments into protocol xml.
1615
1616	=cut
1617
1618	use re 'eval';
1619
1620	my $group;
1621	my $interior; $interior = qr{
1622	# match a pod interior sequence sans C<< >>
1623	(?:
1624	\ (.*?)\ (?{ $group = $^N })
1625	| < (??{$interior}) >
1626	)
1627	}x;
1628
1629	sub expand_cfpod {
1630	my ($self, $pod) = @_;
1631
1632	my $xml;
1633
1634	while () {
1635	if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636	$group = $1;
1637
1638	$group =~ s/&/&amp;/g;
1639	$group =~ s/</&lt;/g;
1640
1641	$xml .= $group;
1642	} elsif ($pod =~ m%\G
1643	([BCGHITU])
1644	<
1645	(?:
1646	([^<>]*) (?{ $group = $^N })
1647	| < $interior >
1648	)
1649	>
1650	%gcsx
1651	) {
1652	my ($code, $data) = ($1, $group);
1653
1654	if ($code eq "B") {
1655	$xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656	} elsif ($code eq "I") {
1657	$xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658	} elsif ($code eq "U") {
1659	$xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660	} elsif ($code eq "C") {
1661	$xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662	} elsif ($code eq "T") {
1663	$xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664	} elsif ($code eq "G") {
1665	my ($male, $female) = split /\|/, $data;
1666	$data = $self->gender ? $female : $male;
1667	$xml .= expand_cfpod ($self, $data);
1668	} elsif ($code eq "H") {
1669	$xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670	"<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671	"")
1672	[$self->{hintmode}];
1673	} else {
1674	$xml .= "error processing '$code($data)' directive";
1675	}
1676	} else {
1677	if ($pod =~ /\G(.+)/) {
1678	warn "parse error while expanding $pod (at $1)";
1679	}
1680	last;
1681	}
1682	}
1683
1684	for ($xml) {
1685	# create single paragraphs (very hackish)
1686	s/(?<=\S)\n(?=\w)/ /g;
1687
1688	# compress some whitespace
1689	s/\s+\n/\n/g; # ws line-ends
1690	s/\n\n+/\n/g; # double lines
1691	s/^\n+//; # beginning lines
1692	s/\n+$//; # ending lines
1693	}
1694
1695	$xml
1696	}
1697
1698	no re 'eval';
1699
1700	sub hintmode {
1701	$_[0]{hintmode} = $_[1] if @_ > 1;
1702	$_[0]{hintmode}
1703	}
1704		1645
1705	=item $player->ext_reply ($msgid, @msg)	1646	=item $player->ext_reply ($msgid, @msg)
1706		1647
1707	Sends an ext reply to the player.	1648	Sends an ext reply to the player.
1708		1649
…		…
1909		1850
1910	# the temporary/swap location	1851	# the temporary/swap location
1911	sub save_path {	1852	sub save_path {
1912	my ($self) = @_;	1853	my ($self) = @_;
1913		1854
1914	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1855	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915	"$TMPDIR/$path.map"	1856	"$TMPDIR/$path.map"
1916	}	1857	}
1917		1858
1918	# the unique path, undef == no special unique path	1859	# the unique path, undef == no special unique path
1919	sub uniq_path {	1860	sub uniq_path {
1920	my ($self) = @_;	1861	my ($self) = @_;
1921		1862
1922	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1863	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923	"$UNIQUEDIR/$path"	1864	"$UNIQUEDIR/$path"
1924	}
1925
1926	# and all this just because we cannot iterate over
1927	# all maps in C++...
1928	sub change_all_map_light {
1929	my ($change) = @_;
1930
1931	$_->change_map_light ($change)
1932	for grep $_->outdoor, values %cf::MAP;
1933	}	1865	}
1934		1866
1935	sub decay_objects {	1867	sub decay_objects {
1936	my ($self) = @_;	1868	my ($self) = @_;
1937		1869
…		…
2021	sub find {	1953	sub find {
2022	my ($path, $origin) = @_;	1954	my ($path, $origin) = @_;
2023		1955
2024	$path = normalise $path, $origin && $origin->path;	1956	$path = normalise $path, $origin && $origin->path;
2025		1957
2026	cf::lock_wait "map_data:$path";#d#remove	1958	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027	cf::lock_wait "map_find:$path";	1959	my $guard2 = cf::lock_acquire "map_find:$path";
2028		1960
2029	$cf::MAP{$path} || do {	1961	$cf::MAP{$path} || do {
2030	my $guard1 = cf::lock_acquire "map_find:$path";
2031	my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033	my $map = new_from_path cf::map $path	1962	my $map = new_from_path cf::map $path
2034	or return;	1963	or return;
2035		1964
2036	$map->{last_save} = $cf::RUNTIME;	1965	$map->{last_save} = $cf::RUNTIME;
2037		1966
…		…
2039	or return;	1968	or return;
2040		1969
2041	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)	1970	if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042	# doing this can freeze the server in a sync job, obviously	1971	# doing this can freeze the server in a sync job, obviously
2043	#$cf::WAIT_FOR_TICK->wait;	1972	#$cf::WAIT_FOR_TICK->wait;
		1973	undef $guard2;
2044	undef $guard1;	1974	undef $guard1;
2045	undef $guard2;
2046	$map->reset;	1975	$map->reset;
2047	return find $path;	1976	return find $path;
2048	}	1977	}
2049		1978
2050	$cf::MAP{$path} = $map	1979	$cf::MAP{$path} = $map
…		…
2077	my $f = new_from_file cf::object::thawer $self->{load_path};	2006	my $f = new_from_file cf::object::thawer $self->{load_path};
2078	$f->skip_block;	2007	$f->skip_block;
2079	$self->_load_objects ($f)	2008	$self->_load_objects ($f)
2080	or return;	2009	or return;
2081		2010
2082	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	2011	$self->post_load_original
2083	if delete $self->{load_original};	2012	if delete $self->{load_original};
2084		2013
2085	if (my $uniq = $self->uniq_path) {	2014	if (my $uniq = $self->uniq_path) {
2086	utf8::encode $uniq;	2015	utf8::encode $uniq;
2087	unless (aio_stat $uniq) {	2016	unless (aio_stat $uniq) {
…		…
2105	unless ($self->{deny_activate}) {	2034	unless ($self->{deny_activate}) {
2106	$self->decay_objects;	2035	$self->decay_objects;
2107	$self->fix_auto_apply;	2036	$self->fix_auto_apply;
2108	$self->update_buttons;	2037	$self->update_buttons;
2109	cf::cede_to_tick;	2038	cf::cede_to_tick;
2110	$self->set_darkness_map;
2111	cf::cede_to_tick;
2112	$self->activate;	2039	$self->activate;
2113	}	2040	}
2114		2041
2115	$self->{last_save} = $cf::RUNTIME;	2042	$self->{last_save} = $cf::RUNTIME;
2116	$self->last_access ($cf::RUNTIME);	2043	$self->last_access ($cf::RUNTIME);
2117		2044
2118	$self->in_memory (cf::MAP_IN_MEMORY);	2045	$self->in_memory (cf::MAP_ACTIVE);
2119	}	2046	}
2120		2047
2121	$self->post_load;	2048	$self->post_load;
2122	}	2049	}
2123		2050
…		…
2181	my ($path, $origin, $load) = @_;	2108	my ($path, $origin, $load) = @_;
2182		2109
2183	$path = normalise $path, $origin && $origin->{path};	2110	$path = normalise $path, $origin && $origin->{path};
2184		2111
2185	if (my $map = $cf::MAP{$path}) {	2112	if (my $map = $cf::MAP{$path}) {
2186	return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;	2113	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187	}	2114	}
2188		2115
2189	$MAP_PREFETCH{$path} |= $load;	2116	$MAP_PREFETCH{$path} |= $load;
2190		2117
2191	$MAP_PREFETCHER ||= cf::async {	2118	$MAP_PREFETCHER ||= cf::async {
…		…
2228	cf::async {	2155	cf::async {
2229	$Coro::current->{desc} = "map player save";	2156	$Coro::current->{desc} = "map player save";
2230	$_->contr->save for $self->players;	2157	$_->contr->save for $self->players;
2231	};	2158	};
2232		2159
		2160	cf::get_slot 0.02;
		2161
2233	if ($uniq) {	2162	if ($uniq) {
2234	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);	2163	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235	$self->_save_objects ($uniq, cf::IO_UNIQUES);	2164	$self->_save_objects ($uniq, cf::IO_UNIQUES);
2236	} else {	2165	} else {
2237	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2166	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
…		…
2245	$self->save;	2174	$self->save;
2246		2175
2247	my $lock = cf::lock_acquire "map_data:$self->{path}";	2176	my $lock = cf::lock_acquire "map_data:$self->{path}";
2248		2177
2249	return if $self->players;	2178	return if $self->players;
2250	return if $self->in_memory != cf::MAP_IN_MEMORY;	2179	return if $self->in_memory != cf::MAP_ACTIVE;
2251	return if $self->{deny_save};	2180	return if $self->{deny_save};
2252		2181
2253	$self->in_memory (cf::MAP_SWAPPED);	2182	$self->in_memory (cf::MAP_SWAPPED);
2254		2183
2255	$self->deactivate;	2184	$self->deactivate;
…		…
2373		2302
2374	sub unique_maps() {	2303	sub unique_maps() {
2375	[	2304	[
2376	map {	2305	map {
2377	utf8::decode $_;	2306	utf8::decode $_;
2378	/\.map$/	2307	s/\.map$//; # TODO future compatibility hack
		2308	/\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
		2309	? ()
2379	? normalise $_	2310	: normalise $_
2380	: ()
2381	} @{ aio_readdir $UNIQUEDIR or [] }	2311	} @{ aio_readdir $UNIQUEDIR or [] }
2382	]	2312	]
2383	}	2313	}
2384		2314
2385	=back	2315	=back
…		…
2392		2322
2393	=over 4	2323	=over 4
2394		2324
2395	=item $ob->inv_recursive	2325	=item $ob->inv_recursive
2396		2326
2397	Returns the inventory of the object _and_ their inventories, recursively.	2327	Returns the inventory of the object I<and> their inventories, recursively,
		2328	but I<not> the object itself.
2398		2329
2399	=cut	2330	=cut
2400		2331
2401	sub inv_recursive_;	2332	sub inv_recursive_;
2402	sub inv_recursive_ {	2333	sub inv_recursive_ {
…		…
2407	inv_recursive_ inv $_[0]	2338	inv_recursive_ inv $_[0]
2408	}	2339	}
2409		2340
2410	=item $ref = $ob->ref	2341	=item $ref = $ob->ref
2411		2342
2412	creates and returns a persistent reference to an objetc that can be stored as a string.	2343	Creates and returns a persistent reference to an object that can be stored as a string.
2413		2344
2414	=item $ob = cf::object::deref ($refstring)	2345	=item $ob = cf::object::deref ($refstring)
2415		2346
2416	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2347	returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417	even if the object actually exists. May block.	2348	even if the object actually exists. May block.
…		…
2449	can be C<undef>. Does the right thing when the player is currently in a	2380	can be C<undef>. Does the right thing when the player is currently in a
2450	dialogue with the given NPC character.	2381	dialogue with the given NPC character.
2451		2382
2452	=cut	2383	=cut
2453		2384
		2385	our $SAY_CHANNEL = {
		2386	id => "say",
		2387	title => "Map",
		2388	reply => "say ",
		2389	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
		2390	};
		2391
		2392	our $CHAT_CHANNEL = {
		2393	id => "chat",
		2394	title => "Chat",
		2395	reply => "chat ",
		2396	tooltip => "Player chat and shouts, global to the server.",
		2397	};
		2398
2454	# rough implementation of a future "reply" method that works	2399	# rough implementation of a future "reply" method that works
2455	# with dialog boxes.	2400	# with dialog boxes.
2456	#TODO: the first argument must go, split into a $npc->reply_to ( method	2401	#TODO: the first argument must go, split into a $npc->reply_to ( method
2457	sub cf::object::player::reply($$$;$) {	2402	sub cf::object::player::reply($$$;$) {
2458	my ($self, $npc, $msg, $flags) = @_;	2403	my ($self, $npc, $msg, $flags) = @_;
…		…
2469	my $dialog = $pl->{npc_dialog};	2414	my $dialog = $pl->{npc_dialog};
2470	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));	2415	$dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471		2416
2472	} else {	2417	} else {
2473	$msg = $npc->name . " says: $msg" if $npc;	2418	$msg = $npc->name . " says: $msg" if $npc;
2474	$self->message ($msg, $flags);	2419	$self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475	}	2420	}
2476	}	2421	}
2477	}	2422	}
2478		2423
2479	=item $object->send_msg ($channel, $msg, $color, [extra...])	2424	=item $object->send_msg ($channel, $msg, $color, [extra...])
…		…
2504		2449
2505	=item $player_object->enter_link	2450	=item $player_object->enter_link
2506		2451
2507	Freezes the player and moves him/her to a special map (C<{link}>).	2452	Freezes the player and moves him/her to a special map (C<{link}>).
2508		2453
2509	The player should be reasonably safe there for short amounts of time. You	2454	The player should be reasonably safe there for short amounts of time (e.g.
2510	I<MUST> call C<leave_link> as soon as possible, though.	2455	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2456	though, as the palyer cannot control the character while it is on the link
		2457	map.
2511		2458
2512	Will never block.	2459	Will never block.
2513		2460
2514	=item $player_object->leave_link ($map, $x, $y)	2461	=item $player_object->leave_link ($map, $x, $y)
2515		2462
…		…
2573		2520
2574	$map->load;	2521	$map->load;
2575	$map->load_neighbours;	2522	$map->load_neighbours;
2576		2523
2577	return unless $self->contr->active;	2524	return unless $self->contr->active;
		2525	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2578	$self->activate_recursive;	2526	$self->activate_recursive;
2579		2527
2580	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2528	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581	$self->enter_map ($map, $x, $y);	2529	$self->enter_map ($map, $x, $y);
2582	}	2530	}
…		…
2586	Moves the player to the given map-path and coordinates by first freezing	2534	Moves the player to the given map-path and coordinates by first freezing
2587	her, loading and preparing them map, calling the provided $check callback	2535	her, loading and preparing them map, calling the provided $check callback
2588	that has to return the map if sucecssful, and then unfreezes the player on	2536	that has to return the map if sucecssful, and then unfreezes the player on
2589	the new (success) or old (failed) map position. In either case, $done will	2537	the new (success) or old (failed) map position. In either case, $done will
2590	be called at the end of this process.	2538	be called at the end of this process.
		2539
		2540	Note that $check will be called with a potentially non-loaded map, so if
		2541	it needs a loaded map it has to call C<< ->load >>.
2591		2542
2592	=cut	2543	=cut
2593		2544
2594	our $GOTOGEN;	2545	our $GOTOGEN;
2595		2546
…		…
2674	}	2625	}
2675		2626
2676	sub prepare_random_map {	2627	sub prepare_random_map {
2677	my ($exit) = @_;	2628	my ($exit) = @_;
2678		2629
2679	my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681	# all this does is basically replace the /! path by	2630	# all this does is basically replace the /! path by
2682	# a new random map path (?random/...) with a seed	2631	# a new random map path (?random/...) with a seed
2683	# that depends on the exit object	2632	# that depends on the exit object
2684		2633
2685	my $rmp = parse_random_map_params $exit->msg;	2634	my $rmp = parse_random_map_params $exit->msg;
…		…
2687	if ($exit->map) {	2636	if ($exit->map) {
2688	$rmp->{region} = $exit->region->name;	2637	$rmp->{region} = $exit->region->name;
2689	$rmp->{origin_map} = $exit->map->path;	2638	$rmp->{origin_map} = $exit->map->path;
2690	$rmp->{origin_x} = $exit->x;	2639	$rmp->{origin_x} = $exit->x;
2691	$rmp->{origin_y} = $exit->y;	2640	$rmp->{origin_y} = $exit->y;
		2641
		2642	$exit->map->touch;
2692	}	2643	}
2693		2644
2694	$rmp->{random_seed} ||= $exit->random_seed;	2645	$rmp->{random_seed} ||= $exit->random_seed;
2695		2646
2696	my $data = cf::encode_json $rmp;	2647	my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697	my $md5 = Digest::MD5::md5_hex $data;	2648	my $md5 = Digest::MD5::md5_hex $data;
2698	my $meta = "$RANDOMDIR/$md5.meta";	2649	my $meta = "$RANDOMDIR/$md5.meta";
2699		2650
2700	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {	2651	if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701	aio_write $fh, 0, (length $data), $data, 0;	2652	aio_write $fh, 0, (length $data), $data, 0;
2702	undef $fh;	2653	undef $fh;
2703	aio_rename "$meta~", $meta;	2654	aio_rename "$meta~", $meta;
2704		2655
		2656	my $slaying = "?random/$md5";
		2657
		2658	if ($exit->valid) {
2705	$exit->slaying ("?random/$md5");	2659	$exit->slaying ("?random/$md5");
2706	$exit->msg (undef);	2660	$exit->msg (undef);
		2661	}
2707	}	2662	}
2708	}	2663	}
2709		2664
2710	sub cf::object::player::enter_exit {	2665	sub cf::object::player::enter_exit {
2711	my ($self, $exit) = @_;	2666	my ($self, $exit) = @_;
2712		2667
2713	return unless $self->type == cf::PLAYER;	2668	return unless $self->type == cf::PLAYER;
2714		2669
2715	if ($exit->slaying eq "/!") {
2716	#TODO: this should de-fi-ni-te-ly not be a sync-job
2717	# the problem is that $exit might not survive long enough
2718	# so it needs to be done right now, right here
2719	cf::sync_job { prepare_random_map $exit };
2720	}
2721
2722	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723	my $hp = $exit->stats->hp;
2724	my $sp = $exit->stats->sp;
2725
2726	$self->enter_link;	2670	$self->enter_link;
2727		2671
2728	# if exit is damned, update players death & WoR home-position
2729	$self->contr->savebed ($slaying, $hp, $sp)
2730	if $exit->flag (FLAG_DAMNED);
2731
2732	(async {	2672	(async {
2733	$Coro::current->{desc} = "enter_exit $slaying $hp $sp";	2673	$Coro::current->{desc} = "enter_exit";
2734		2674
2735	$self->deactivate_recursive; # just to be sure
2736	unless (eval {	2675	unless (eval {
		2676	$self->deactivate_recursive; # just to be sure
		2677
		2678	# random map handling
		2679	{
		2680	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2681
		2682	prepare_random_map $exit
		2683	if $exit->slaying eq "/!";
		2684	}
		2685
		2686	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
		2687	my $x = $exit->stats->hp;
		2688	my $y = $exit->stats->sp;
		2689
2737	$self->goto ($slaying, $hp, $sp);	2690	$self->goto ($map, $x, $y);
2738		2691
		2692	# if exit is damned, update players death & WoR home-position
		2693	$self->contr->savebed ($map, $x, $y)
		2694	if $exit->flag (cf::FLAG_DAMNED);
		2695
2739	1;	2696	1
2740	}) {	2697	}) {
2741	$self->message ("Something went wrong deep within the crossfire server. "	2698	$self->message ("Something went wrong deep within the deliantra server. "
2742	. "I'll try to bring you back to the map you were before. "	2699	. "I'll try to bring you back to the map you were before. "
2743	. "Please report this to the dungeon master!",	2700	. "Please report this to the dungeon master!",
2744	cf::NDI_UNIQUE | cf::NDI_RED);	2701	cf::NDI_UNIQUE | cf::NDI_RED);
2745		2702
2746	warn "ERROR in enter_exit: $@";	2703	warn "ERROR in enter_exit: $@";
…		…
2812	id => "infobox",	2769	id => "infobox",
2813	title => "Body Parts",	2770	title => "Body Parts",
2814	reply => undef,	2771	reply => undef,
2815	tooltip => "Shows which body parts you posess and are available",	2772	tooltip => "Shows which body parts you posess and are available",
2816	},	2773	},
		2774	"c/skills" => {
		2775	id => "infobox",
		2776	title => "Skills",
		2777	reply => undef,
		2778	tooltip => "Shows your experience per skill and item power",
		2779	},
2817	"c/uptime" => {	2780	"c/uptime" => {
2818	id => "infobox",	2781	id => "infobox",
2819	title => "Uptime",	2782	title => "Uptime",
2820	reply => undef,	2783	reply => undef,
2821	tooltip => "How long the server has been running since last restart",	2784	tooltip => "How long the server has been running since last restart",
…		…
2824	id => "infobox",	2787	id => "infobox",
2825	title => "Map Info",	2788	title => "Map Info",
2826	reply => undef,	2789	reply => undef,
2827	tooltip => "Information related to the maps",	2790	tooltip => "Information related to the maps",
2828	},	2791	},
		2792	"c/party" => {
		2793	id => "party",
		2794	title => "Party",
		2795	reply => "gsay ",
		2796	tooltip => "Messages and chat related to your party",
		2797	},
		2798	"c/death" => {
		2799	id => "death",
		2800	title => "Death",
		2801	reply => undef,
		2802	tooltip => "Reason for and more info about your most recent death",
		2803	},
		2804	"c/say" => $SAY_CHANNEL,
		2805	"c/chat" => $CHAT_CHANNEL,
2829	);	2806	);
2830		2807
2831	sub cf::client::send_msg {	2808	sub cf::client::send_msg {
2832	my ($self, $channel, $msg, $color, @extra) = @_;	2809	my ($self, $channel, $msg, $color, @extra) = @_;
2833		2810
2834	$msg = $self->pl->expand_cfpod ($msg);	2811	$msg = $self->pl->expand_cfpod ($msg)
		2812	unless $color & cf::NDI_VERBATIM;
2835		2813
2836	$color &= cf::NDI_CLIENT_MASK; # just in case...	2814	$color &= cf::NDI_CLIENT_MASK; # just in case...
2837		2815
2838	# check predefined channels, for the benefit of C	2816	# check predefined channels, for the benefit of C
2839	if ($CHANNEL{$channel}) {	2817	if ($CHANNEL{$channel}) {
2840	$channel = $CHANNEL{$channel};	2818	$channel = $CHANNEL{$channel};
2841		2819
2842	$self->ext_msg (channel_info => $channel)	2820	$self->ext_msg (channel_info => $channel);
2843	if $self->can_msg;
2844
2845	$channel = $channel->{id};	2821	$channel = $channel->{id};
2846		2822
2847	} elsif (ref $channel) {	2823	} elsif (ref $channel) {
2848	# send meta info to client, if not yet sent	2824	# send meta info to client, if not yet sent
2849	unless (exists $self->{channel}{$channel->{id}}) {	2825	unless (exists $self->{channel}{$channel->{id}}) {
2850	$self->{channel}{$channel->{id}} = $channel;	2826	$self->{channel}{$channel->{id}} = $channel;
2851	$self->ext_msg (channel_info => $channel)	2827	$self->ext_msg (channel_info => $channel);
2852	if $self->can_msg;
2853	}	2828	}
2854		2829
2855	$channel = $channel->{id};	2830	$channel = $channel->{id};
2856	}	2831	}
2857		2832
2858	return unless @extra || length $msg;	2833	return unless @extra || length $msg;
2859		2834
2860	if ($self->can_msg) {
2861	# default colour, mask it out	2835	# default colour, mask it out
2862	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)	2836	$color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863	if $color & cf::NDI_DEF;	2837	if $color & cf::NDI_DEF;
2864		2838
2865	$self->send_packet ("msg " . $self->{json_coder}->encode (	2839	my $pkt = "msg "
		2840	. $self->{json_coder}->encode (
2866	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));	2841	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867	} else {	2842	);
2868	if ($color >= 0) {
2869	# replace some tags by gcfclient-compatible ones
2870	for ($msg) {
2871	1 while
2872	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873	|| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874	|| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875	|| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876	|| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877	}
2878		2843
2879	$color &= cf::NDI_COLOR_MASK;	2844	# try lzf for large packets
		2845	$pkt = "lzf " . Compress::LZF::compress $pkt
		2846	if 1024 <= length $pkt and $self->{can_lzf};
2880		2847
2881	utf8::encode $msg;	2848	# split very large packets
2882		2849	if (8192 < length $pkt and $self->{can_lzf}) {
2883	if (0 && $msg =~ /\[/) {	2850	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2884	# COMMAND/INFO	2851	$pkt = "frag";
2885	$self->send_packet ("drawextinfo $color 10 8 $msg")
2886	} else {
2887	$msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888	$self->send_packet ("drawinfo $color $msg")
2889	}
2890	}
2891	}	2852	}
		2853
		2854	$self->send_packet ($pkt);
2892	}	2855	}
2893		2856
2894	=item $client->ext_msg ($type, @msg)	2857	=item $client->ext_msg ($type, @msg)
2895		2858
2896	Sends an ext event to the client.	2859	Sends an ext event to the client.
…		…
3070		3033
3071	The following functions and methods are available within a safe environment:	3034	The following functions and methods are available within a safe environment:
3072		3035
3073	cf::object	3036	cf::object
3074	contr pay_amount pay_player map x y force_find force_add destroy	3037	contr pay_amount pay_player map x y force_find force_add destroy
3075	insert remove name archname title slaying race decrease_ob_nr	3038	insert remove name archname title slaying race decrease split
3076		3039
3077	cf::object::player	3040	cf::object::player
3078	player	3041	player
3079		3042
3080	cf::player	3043	cf::player
…		…
3085		3048
3086	=cut	3049	=cut
3087		3050
3088	for (	3051	for (
3089	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3052	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090	insert remove inv name archname title slaying race	3053	insert remove inv nrof name archname title slaying race
3091	decrease_ob_nr destroy)],	3054	decrease split destroy change_exp)],
3092	["cf::object::player" => qw(player)],	3055	["cf::object::player" => qw(player)],
3093	["cf::player" => qw(peaceful)],	3056	["cf::player" => qw(peaceful)],
3094	["cf::map" => qw(trigger)],	3057	["cf::map" => qw(trigger)],
3095	) {	3058	) {
3096	no strict 'refs';	3059	no strict 'refs';
…		…
3304	while (my ($k, $v) = each %$want) {	3267	while (my ($k, $v) = each %$want) {
3305	$ns->fx_want ($k, $v);	3268	$ns->fx_want ($k, $v);
3306	}	3269	}
3307	};	3270	};
3308		3271
		3272	sub load_resource_file($) {
		3273	my $guard = lock_acquire "load_resource_file";
		3274
		3275	my $status = load_resource_file_ $_[0];
		3276	get_slot 0.1, 100;
		3277	cf::arch::commit_load;
		3278
		3279	$status
		3280	}
		3281
3309	sub reload_regions {	3282	sub reload_regions {
3310	# HACK to clear player env face cache, we need some signal framework	3283	# HACK to clear player env face cache, we need some signal framework
3311	# for this (global event?)	3284	# for this (global event?)
3312	%ext::player_env::MUSIC_FACE_CACHE = ();	3285	%ext::player_env::MUSIC_FACE_CACHE = ();
3313		3286
…		…
3326	}	3299	}
3327		3300
3328	sub reload_archetypes {	3301	sub reload_archetypes {
3329	load_resource_file "$DATADIR/archetypes"	3302	load_resource_file "$DATADIR/archetypes"
3330	or die "unable to load archetypes\n";	3303	or die "unable to load archetypes\n";
3331	#d# NEED to laod twice to resolve forward references
3332	# this really needs to be done in an extra post-pass
3333	# (which needs to be synchronous, so solve it differently)
3334	load_resource_file "$DATADIR/archetypes"
3335	or die "unable to load archetypes\n";
3336	}	3304	}
3337		3305
3338	sub reload_treasures {	3306	sub reload_treasures {
3339	load_resource_file "$DATADIR/treasures"	3307	load_resource_file "$DATADIR/treasures"
3340	or die "unable to load treasurelists\n";	3308	or die "unable to load treasurelists\n";
3341	}	3309	}
3342		3310
3343	sub reload_resources {	3311	sub reload_resources {
3344	warn "reloading resource files...\n";	3312	warn "reloading resource files...\n";
3345		3313
		3314	reload_facedata;
		3315	reload_archetypes;
3346	reload_regions;	3316	reload_regions;
3347	reload_facedata;
3348	#reload_archetypes;#d#
3349	reload_archetypes;
3350	reload_treasures;	3317	reload_treasures;
3351		3318
3352	warn "finished reloading resource files\n";	3319	warn "finished reloading resource files\n";
3353	}
3354
3355	sub init {
3356	reload_resources;
3357	}	3320	}
3358		3321
3359	sub reload_config {	3322	sub reload_config {
3360	open my $fh, "<:utf8", "$CONFDIR/config"	3323	open my $fh, "<:utf8", "$CONFDIR/config"
3361	or return;	3324	or return;
…		…
3375	};	3338	};
3376	warn $@ if $@;	3339	warn $@ if $@;
3377	}	3340	}
3378	}	3341	}
3379		3342
		3343	sub pidfile() {
		3344	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
		3345	or die "$PIDFILE: $!";
		3346	flock $fh, &Fcntl::LOCK_EX
		3347	or die "$PIDFILE: flock: $!";
		3348	$fh
		3349	}
		3350
		3351	# make sure only one server instance is running at any one time
		3352	sub atomic {
		3353	my $fh = pidfile;
		3354
		3355	my $pid = <$fh>;
		3356	kill 9, $pid if $pid > 0;
		3357
		3358	seek $fh, 0, 0;
		3359	print $fh $$;
		3360	}
		3361
3380	sub main {	3362	sub main {
		3363	cf::init_globals; # initialise logging
		3364
		3365	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3366	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3367	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3368	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3369
		3370	cf::init_experience;
		3371	cf::init_anim;
		3372	cf::init_attackmess;
		3373	cf::init_dynamic;
		3374
		3375	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3376
3381	# we must not ever block the main coroutine	3377	# we must not ever block the main coroutine
3382	local $Coro::idle = sub {	3378	local $Coro::idle = sub {
3383	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3379	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384	(async {	3380	(async {
3385	$Coro::current->{desc} = "IDLE BUG HANDLER";	3381	$Coro::current->{desc} = "IDLE BUG HANDLER";
3386	EV::loop EV::LOOP_ONESHOT;	3382	EV::loop EV::LOOP_ONESHOT;
3387	})->prio (Coro::PRIO_MAX);	3383	})->prio (Coro::PRIO_MAX);
3388	};	3384	};
3389		3385
3390	reload_config;
3391	db_init;
3392	load_extensions;
3393
3394	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395	evthread_start IO::AIO::poll_fileno;	3386	evthread_start IO::AIO::poll_fileno;
		3387
		3388	cf::sync_job {
		3389	reload_resources;
		3390	reload_config;
		3391	db_init;
		3392
		3393	cf::load_settings;
		3394	cf::load_materials;
		3395	cf::init_uuid;
		3396	cf::init_signals;
		3397	cf::init_commands;
		3398	cf::init_skills;
		3399
		3400	cf::init_beforeplay;
		3401
		3402	atomic;
		3403
		3404	load_extensions;
		3405
		3406	utime time, time, $RUNTIMEFILE;
		3407
		3408	# no (long-running) fork's whatsoever before this point(!)
		3409	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3410
		3411	(pop @POST_INIT)->(0) while @POST_INIT;
		3412	};
		3413
3396	EV::loop;	3414	EV::loop;
3397	}	3415	}
3398		3416
3399	#############################################################################	3417	#############################################################################
3400	# initialisation and cleanup	3418	# initialisation and cleanup
…		…
3408	};	3426	};
3409	}	3427	}
3410	}	3428	}
3411		3429
3412	sub write_runtime_sync {	3430	sub write_runtime_sync {
3413	my $runtime = "$LOCALDIR/runtime";
3414
3415	# first touch the runtime file to show we are still running:	3431	# first touch the runtime file to show we are still running:
3416	# the fsync below can take a very very long time.	3432	# the fsync below can take a very very long time.
3417		3433
3418	IO::AIO::aio_utime $runtime, undef, undef;	3434	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419		3435
3420	my $guard = cf::lock_acquire "write_runtime";	3436	my $guard = cf::lock_acquire "write_runtime";
3421		3437
3422	my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644	3438	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423	or return;	3439	or return;
3424		3440
3425	my $value = $cf::RUNTIME + 90 + 10;	3441	my $value = $cf::RUNTIME + 90 + 10;
3426	# 10 is the runtime save interval, for a monotonic clock	3442	# 10 is the runtime save interval, for a monotonic clock
3427	# 60 allows for the watchdog to kill the server.	3443	# 60 allows for the watchdog to kill the server.
…		…
3437	aio_utime $fh, undef, undef;	3453	aio_utime $fh, undef, undef;
3438		3454
3439	close $fh	3455	close $fh
3440	or return;	3456	or return;
3441		3457
3442	aio_rename "$runtime~", $runtime	3458	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443	and return;	3459	and return;
3444		3460
3445	warn "runtime file written.\n";	3461	warn "runtime file written.\n";
3446		3462
3447	1	3463	1
…		…
3459	my $uuid = "$LOCALDIR/uuid";	3475	my $uuid = "$LOCALDIR/uuid";
3460		3476
3461	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644	3477	my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462	or return;	3478	or return;
3463		3479
3464	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3480	my $value = uuid_seq uuid_cur;
		3481
		3482	unless ($value) {
		3483	warn "cowardly refusing to write zero uuid value!\n";
		3484	return;
		3485	}
		3486
		3487	my $value = uuid_str $value + $uuid_skip;
3465	$uuid_skip = 0;	3488	$uuid_skip = 0;
3466		3489
3467	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3490	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3468	and return;	3491	and return;
3469		3492
…		…
3491	}	3514	}
3492		3515
3493	sub emergency_save() {	3516	sub emergency_save() {
3494	my $freeze_guard = cf::freeze_mainloop;	3517	my $freeze_guard = cf::freeze_mainloop;
3495		3518
3496	warn "enter emergency perl save\n";	3519	warn "emergency_perl_save: enter\n";
3497		3520
3498	cf::sync_job {	3521	cf::sync_job {
		3522	# this is a trade-off: we want to be very quick here, so
		3523	# save all maps without fsync, and later call a global sync
		3524	# (which in turn might be very very slow)
		3525	local $USE_FSYNC = 0;
		3526
3499	# use a peculiar iteration method to avoid tripping on perl	3527	# use a peculiar iteration method to avoid tripping on perl
3500	# refcount bugs in for. also avoids problems with players	3528	# refcount bugs in for. also avoids problems with players
3501	# and maps saved/destroyed asynchronously.	3529	# and maps saved/destroyed asynchronously.
3502	warn "begin emergency player save\n";	3530	warn "emergency_perl_save: begin player save\n";
3503	for my $login (keys %cf::PLAYER) {	3531	for my $login (keys %cf::PLAYER) {
3504	my $pl = $cf::PLAYER{$login} or next;	3532	my $pl = $cf::PLAYER{$login} or next;
3505	$pl->valid or next;	3533	$pl->valid or next;
3506	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3534	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507	$pl->save;	3535	$pl->save;
3508	}	3536	}
3509	warn "end emergency player save\n";	3537	warn "emergency_perl_save: end player save\n";
3510		3538
3511	warn "begin emergency map save\n";	3539	warn "emergency_perl_save: begin map save\n";
3512	for my $path (keys %cf::MAP) {	3540	for my $path (keys %cf::MAP) {
3513	my $map = $cf::MAP{$path} or next;	3541	my $map = $cf::MAP{$path} or next;
3514	$map->valid or next;	3542	$map->valid or next;
3515	$map->save;	3543	$map->save;
3516	}	3544	}
3517	warn "end emergency map save\n";	3545	warn "emergency_perl_save: end map save\n";
3518		3546
3519	warn "begin emergency database checkpoint\n";	3547	warn "emergency_perl_save: begin database checkpoint\n";
3520	BDB::db_env_txn_checkpoint $DB_ENV;	3548	BDB::db_env_txn_checkpoint $DB_ENV;
3521	warn "end emergency database checkpoint\n";	3549	warn "emergency_perl_save: end database checkpoint\n";
3522		3550
3523	warn "begin write uuid\n";	3551	warn "emergency_perl_save: begin write uuid\n";
3524	write_uuid_sync 1;	3552	write_uuid_sync 1;
3525	warn "end write uuid\n";	3553	warn "emergency_perl_save: end write uuid\n";
3526	};	3554	};
3527		3555
		3556	warn "emergency_perl_save: starting sync()\n";
		3557	IO::AIO::aio_sync sub {
		3558	warn "emergency_perl_save: finished sync()\n";
		3559	};
		3560
3528	warn "leave emergency perl save\n";	3561	warn "emergency_perl_save: leave\n";
3529	}	3562	}
3530		3563
3531	sub post_cleanup {	3564	sub post_cleanup {
3532	my ($make_core) = @_;	3565	my ($make_core) = @_;
3533		3566
3534	warn Carp::longmess "post_cleanup backtrace"	3567	warn Carp::longmess "post_cleanup backtrace"
3535	if $make_core;	3568	if $make_core;
		3569
		3570	my $fh = pidfile;
		3571	unlink $PIDFILE if <$fh> == $$;
		3572	}
		3573
		3574	# a safer delete_package, copied from Symbol
		3575	sub clear_package($) {
		3576	my $pkg = shift;
		3577
		3578	# expand to full symbol table name if needed
		3579	unless ($pkg =~ /^main::.*::$/) {
		3580	$pkg = "main$pkg" if $pkg =~ /^::/;
		3581	$pkg = "main::$pkg" unless $pkg =~ /^main::/;
		3582	$pkg .= '::' unless $pkg =~ /::$/;
		3583	}
		3584
		3585	my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
		3586	my $stem_symtab = *{$stem}{HASH};
		3587
		3588	defined $stem_symtab and exists $stem_symtab->{$leaf}
		3589	or return;
		3590
		3591	# clear all symbols
		3592	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
		3593	for my $name (keys %$leaf_symtab) {
		3594	_gv_clear *{"$pkg$name"};
		3595	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
		3596	}
		3597	warn "cleared package $pkg\n";#d#
3536	}	3598	}
3537		3599
3538	sub do_reload_perl() {	3600	sub do_reload_perl() {
3539	# can/must only be called in main	3601	# can/must only be called in main
3540	if ($Coro::current != $Coro::main) {	3602	if ($Coro::current != $Coro::main) {
3541	warn "can only reload from main coroutine";	3603	warn "can only reload from main coroutine";
3542	return;	3604	return;
3543	}	3605	}
3544		3606
		3607	return if $RELOAD++;
		3608
		3609	my $t1 = EV::time;
		3610
		3611	while ($RELOAD) {
3545	warn "reloading...";	3612	warn "reloading...";
3546		3613
3547	warn "entering sync_job";	3614	warn "entering sync_job";
3548		3615
3549	cf::sync_job {	3616	cf::sync_job {
3550	cf::write_runtime_sync; # external watchdog should not bark	3617	cf::write_runtime_sync; # external watchdog should not bark
3551	cf::emergency_save;	3618	cf::emergency_save;
3552	cf::write_runtime_sync; # external watchdog should not bark	3619	cf::write_runtime_sync; # external watchdog should not bark
3553		3620
3554	warn "syncing database to disk";	3621	warn "syncing database to disk";
3555	BDB::db_env_txn_checkpoint $DB_ENV;	3622	BDB::db_env_txn_checkpoint $DB_ENV;
3556		3623
3557	# if anything goes wrong in here, we should simply crash as we already saved	3624	# if anything goes wrong in here, we should simply crash as we already saved
3558		3625
3559	warn "flushing outstanding aio requests";	3626	warn "flushing outstanding aio requests";
3560	for (;;) {
3561	BDB::flush;
3562	IO::AIO::flush;
3563	Coro::cede_notself;
3564	last unless IO::AIO::nreqs || BDB::nreqs;	3627	while (IO::AIO::nreqs || BDB::nreqs) {
3565	warn "iterate...";	3628	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566	}
3567
3568	++$RELOAD;
3569
3570	warn "cancelling all extension coros";
3571	$_->cancel for values %EXT_CORO;
3572	%EXT_CORO = ();
3573
3574	warn "removing commands";
3575	%COMMAND = ();
3576
3577	warn "removing ext/exti commands";
3578	%EXTCMD = ();
3579	%EXTICMD = ();
3580
3581	warn "unloading/nuking all extensions";
3582	for my $pkg (@EXTS) {
3583	warn "... unloading $pkg";
3584
3585	if (my $cb = $pkg->can ("unload")) {
3586	eval {
3587	$cb->($pkg);
3588	1
3589	} or warn "$pkg unloaded, but with errors: $@";
3590	}	3629	}
3591		3630
3592	warn "... nuking $pkg";	3631	warn "cancelling all extension coros";
3593	Symbol::delete_package $pkg;	3632	$_->cancel for values %EXT_CORO;
3594	}	3633	%EXT_CORO = ();
3595		3634
3596	warn "unloading all perl modules loaded from $LIBDIR";	3635	warn "removing commands";
3597	while (my ($k, $v) = each %INC) {	3636	%COMMAND = ();
3598	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599		3637
		3638	warn "removing ext/exti commands";
		3639	%EXTCMD = ();
		3640	%EXTICMD = ();
		3641
		3642	warn "unloading/nuking all extensions";
		3643	for my $pkg (@EXTS) {
3600	warn "... unloading $k";	3644	warn "... unloading $pkg";
3601	delete $INC{$k};
3602		3645
3603	$k =~ s/\.pm$//;
3604	$k =~ s/\//::/g;
3605
3606	if (my $cb = $k->can ("unload_module")) {	3646	if (my $cb = $pkg->can ("unload")) {
		3647	eval {
3607	$cb->();	3648	$cb->($pkg);
		3649	1
		3650	} or warn "$pkg unloaded, but with errors: $@";
		3651	}
		3652
		3653	warn "... clearing $pkg";
		3654	clear_package $pkg;
3608	}	3655	}
3609		3656
3610	Symbol::delete_package $k;	3657	warn "unloading all perl modules loaded from $LIBDIR";
		3658	while (my ($k, $v) = each %INC) {
		3659	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
		3660
		3661	warn "... unloading $k";
		3662	delete $INC{$k};
		3663
		3664	$k =~ s/\.pm$//;
		3665	$k =~ s/\//::/g;
		3666
		3667	if (my $cb = $k->can ("unload_module")) {
		3668	$cb->();
		3669	}
		3670
		3671	clear_package $k;
3611	}	3672	}
3612		3673
3613	warn "getting rid of safe::, as good as possible";	3674	warn "getting rid of safe::, as good as possible";
3614	Symbol::delete_package "safe::$_"	3675	clear_package "safe::$_"
3615	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3676	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616		3677
3617	warn "unloading cf.pm \"a bit\"";	3678	warn "unloading cf.pm \"a bit\"";
3618	delete $INC{"cf.pm"};	3679	delete $INC{"cf.pm"};
3619	delete $INC{"cf/pod.pm"};	3680	delete $INC{"cf/pod.pm"};
3620		3681
3621	# don't, removes xs symbols, too,	3682	# don't, removes xs symbols, too,
3622	# and global variables created in xs	3683	# and global variables created in xs
3623	#Symbol::delete_package __PACKAGE__;	3684	#clear_package __PACKAGE__;
3624		3685
3625	warn "unload completed, starting to reload now";	3686	warn "unload completed, starting to reload now";
3626		3687
3627	warn "reloading cf.pm";	3688	warn "reloading cf.pm";
3628	require cf;	3689	require cf;
3629	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	3690	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3630		3691
3631	warn "loading config and database again";	3692	warn "loading config and database again";
3632	cf::reload_config;	3693	cf::reload_config;
3633		3694
3634	warn "loading extensions";	3695	warn "loading extensions";
3635	cf::load_extensions;	3696	cf::load_extensions;
3636		3697
		3698	if ($REATTACH_ON_RELOAD) {
3637	warn "reattaching attachments to objects/players";	3699	warn "reattaching attachments to objects/players";
3638	_global_reattach; # objects, sockets	3700	_global_reattach; # objects, sockets
3639	warn "reattaching attachments to maps";	3701	warn "reattaching attachments to maps";
3640	reattach $_ for values %MAP;	3702	reattach $_ for values %MAP;
3641	warn "reattaching attachments to players";	3703	warn "reattaching attachments to players";
3642	reattach $_ for values %PLAYER;	3704	reattach $_ for values %PLAYER;
		3705	}
3643		3706
		3707	warn "running post_init jobs";
		3708	(pop @POST_INIT)->(1) while @POST_INIT;
		3709
3644	warn "leaving sync_job";	3710	warn "leaving sync_job";
3645		3711
3646	1	3712	1
3647	} or do {	3713	} or do {
3648	warn $@;	3714	warn $@;
3649	cf::cleanup "error while reloading, exiting.";	3715	cf::cleanup "error while reloading, exiting.";
3650	};	3716	};
3651		3717
3652	warn "reloaded";	3718	warn "reloaded";
		3719	--$RELOAD;
		3720	}
		3721
		3722	$t1 = EV::time - $t1;
		3723	warn "reload completed in ${t1}s\n";
3653	};	3724	};
3654		3725
3655	our $RELOAD_WATCHER; # used only during reload	3726	our $RELOAD_WATCHER; # used only during reload
3656		3727
3657	sub reload_perl() {	3728	sub reload_perl() {
3658	# doing reload synchronously and two reloads happen back-to-back,	3729	# doing reload synchronously and two reloads happen back-to-back,
3659	# coro crashes during coro_state_free->destroy here.	3730	# coro crashes during coro_state_free->destroy here.
3660		3731
		3732	$RELOAD_WATCHER ||= cf::async {
		3733	Coro::AIO::aio_wait cache_extensions;
		3734
3661	$RELOAD_WATCHER ||= EV::timer 0, 0, sub {	3735	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662	do_reload_perl;	3736	do_reload_perl;
3663	undef $RELOAD_WATCHER;	3737	undef $RELOAD_WATCHER;
		3738	};
3664	};	3739	};
3665	}	3740	}
3666		3741
3667	register_command "reload" => sub {	3742	register_command "reload" => sub {
3668	my ($who, $arg) = @_;	3743	my ($who, $arg) = @_;
…		…
3682		3757
3683	our @WAIT_FOR_TICK;	3758	our @WAIT_FOR_TICK;
3684	our @WAIT_FOR_TICK_BEGIN;	3759	our @WAIT_FOR_TICK_BEGIN;
3685		3760
3686	sub wait_for_tick {	3761	sub wait_for_tick {
3687	return if tick_inhibit;
3688	return if $Coro::current == $Coro::main;	3762	return if tick_inhibit || $Coro::current == $Coro::main;
3689		3763
3690	my $signal = new Coro::Signal;	3764	my $signal = new Coro::Signal;
3691	push @WAIT_FOR_TICK, $signal;	3765	push @WAIT_FOR_TICK, $signal;
3692	$signal->wait;	3766	$signal->wait;
3693	}	3767	}
3694		3768
3695	sub wait_for_tick_begin {	3769	sub wait_for_tick_begin {
3696	return if tick_inhibit;
3697	return if $Coro::current == $Coro::main;	3770	return if tick_inhibit || $Coro::current == $Coro::main;
3698		3771
3699	my $signal = new Coro::Signal;	3772	my $signal = new Coro::Signal;
3700	push @WAIT_FOR_TICK_BEGIN, $signal;	3773	push @WAIT_FOR_TICK_BEGIN, $signal;
3701	$signal->wait;	3774	$signal->wait;
3702	}	3775	}
…		…
3741	{	3814	{
3742	# configure BDB	3815	# configure BDB
3743		3816
3744	BDB::min_parallel 8;	3817	BDB::min_parallel 8;
3745	BDB::max_poll_reqs $TICK * 0.1;	3818	BDB::max_poll_reqs $TICK * 0.1;
3746	$Coro::BDB::WATCHER->priority (1);	3819	$AnyEvent::BDB::WATCHER->priority (1);
3747		3820
3748	unless ($DB_ENV) {	3821	unless ($DB_ENV) {
3749	$DB_ENV = BDB::db_env_create;	3822	$DB_ENV = BDB::db_env_create;
3750	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC	3823	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751	| BDB::LOG_AUTOREMOVE, 1);	3824	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
		3825	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	3826	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	3827	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754		3828
3755	cf::sync_job {	3829	cf::sync_job {
3756	eval {	3830	eval {
…		…
3782	{	3856	{
3783	# configure IO::AIO	3857	# configure IO::AIO
3784		3858
3785	IO::AIO::min_parallel 8;	3859	IO::AIO::min_parallel 8;
3786	IO::AIO::max_poll_time $TICK * 0.1;	3860	IO::AIO::max_poll_time $TICK * 0.1;
3787	$Coro::AIO::WATCHER->priority (1);	3861	undef $AnyEvent::AIO::WATCHER;
3788	}	3862	}
3789		3863
3790	my $_log_backtrace;	3864	my $_log_backtrace;
3791		3865
3792	sub _log_backtrace {	3866	sub _log_backtrace {
…		…
3795	$msg =~ s/\n//;	3869	$msg =~ s/\n//;
3796		3870
3797	# limit the # of concurrent backtraces	3871	# limit the # of concurrent backtraces
3798	if ($_log_backtrace < 2) {	3872	if ($_log_backtrace < 2) {
3799	++$_log_backtrace;	3873	++$_log_backtrace;
		3874	my $perl_bt = Carp::longmess $msg;
3800	async {	3875	async {
3801	$Coro::current->{desc} = "abt $msg";	3876	$Coro::current->{desc} = "abt $msg";
3802		3877
3803	my @bt = fork_call {	3878	my @bt = fork_call {
3804	@addr = map { sprintf "%x", $_ } @addr;	3879	@addr = map { sprintf "%x", $_ } @addr;
…		…
3815	}	3890	}
3816		3891
3817	@funcs	3892	@funcs
3818	};	3893	};
3819		3894
3820	LOG llevInfo, "[ABT] $msg\n";	3895	LOG llevInfo, "[ABT] $perl_bt\n";
		3896	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821	LOG llevInfo, "[ABT] $_\n" for @bt;	3897	LOG llevInfo, "[ABT] $_\n" for @bt;
3822	--$_log_backtrace;	3898	--$_log_backtrace;
3823	};	3899	};
3824	} else {	3900	} else {
3825	LOG llevInfo, "[ABT] $msg\n";	3901	LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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