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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC

…		…
21		21
22	package cf;	22	package cf;
23		23
24	use 5.10.0;	24	use 5.10.0;
25	use utf8;	25	use utf8;
26	use strict "vars", "subs";	26	use strict qw(vars subs);
27		27
28	use Symbol;	28	use Symbol;
29	use List::Util;	29	use List::Util;
30	use Socket;	30	use Socket;
31	use EV;	31	use EV;
32	use Opcode;	32	use Opcode;
33	use Safe;	33	use Safe;
34	use Safe::Hole;	34	use Safe::Hole;
35	use Storable ();	35	use Storable ();
36		36
		37	use Guard ();
37	use Coro ();	38	use Coro ();
38	use Coro::State;	39	use Coro::State;
39	use Coro::Handle;	40	use Coro::Handle;
40	use Coro::EV;	41	use Coro::EV;
41	use Coro::AnyEvent;	42	use Coro::AnyEvent;
42	use Coro::Timer;	43	use Coro::Timer;
43	use Coro::Signal;	44	use Coro::Signal;
44	use Coro::Semaphore;	45	use Coro::Semaphore;
		46	use Coro::SemaphoreSet;
45	use Coro::AnyEvent;	47	use Coro::AnyEvent;
46	use Coro::AIO;	48	use Coro::AIO;
47	use Coro::BDB 1.6;	49	use Coro::BDB 1.6;
48	use Coro::Storable;	50	use Coro::Storable;
49	use Coro::Util ();	51	use Coro::Util ();
…		…
63		65
64	# configure various modules to our taste	66	# configure various modules to our taste
65	#	67	#
66	$Storable::canonical = 1; # reduce rsync transfers	68	$Storable::canonical = 1; # reduce rsync transfers
67	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";
68	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
69		76
70	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	77	# strictly for debugging
		78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71		79
72	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73		81
74	our %COMMAND = ();	82	our %COMMAND = ();
75	our %COMMAND_TIME = ();	83	our %COMMAND_TIME = ();
…		…
78	our %EXTCMD = ();	86	our %EXTCMD = ();
79	our %EXTICMD = ();	87	our %EXTICMD = ();
80	our %EXT_CORO = (); # coroutines bound to extensions	88	our %EXT_CORO = (); # coroutines bound to extensions
81	our %EXT_MAP = (); # pluggable maps	89	our %EXT_MAP = (); # pluggable maps
82		90
83	our $RELOAD; # number of reloads so far	91	our $RELOAD; # number of reloads so far, non-zero while in reload
84	our @EVENT;	92	our @EVENT;
85		93
86	our $CONFDIR = confdir;	94	our $CONFDIR = confdir;
87	our $DATADIR = datadir;	95	our $DATADIR = datadir;
88	our $LIBDIR = "$DATADIR/ext";	96	our $LIBDIR = "$DATADIR/ext";
89	our $PODDIR = "$DATADIR/pod";	97	our $PODDIR = "$DATADIR/pod";
90	our $MAPDIR = "$DATADIR/" . mapdir;	98	our $MAPDIR = "$DATADIR/" . mapdir;
91	our $LOCALDIR = localdir;	99	our $LOCALDIR = localdir;
92	our $TMPDIR = "$LOCALDIR/" . tmpdir;	100	our $TMPDIR = "$LOCALDIR/" . tmpdir;
93	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	101	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	102	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95	our $RANDOMDIR = "$LOCALDIR/random";	103	our $RANDOMDIR = "$LOCALDIR/random";
96	our $BDBDIR = "$LOCALDIR/db";	104	our $BDBDIR = "$LOCALDIR/db";
		105	our $PIDFILE = "$LOCALDIR/pid";
		106	our $RUNTIMEFILE = "$LOCALDIR/runtime";
		107
97	our %RESOURCE;	108	our %RESOURCE;
98		109
99	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	110	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	111	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101	our $NEXT_TICK;	112	our $NEXT_TICK;
102	our $USE_FSYNC = 1; # use fsync to write maps - default off	113	our $USE_FSYNC = 1; # use fsync to write maps - default on
103		114
104	our $BDB_DEADLOCK_WATCHER;	115	our $BDB_DEADLOCK_WATCHER;
105	our $BDB_CHECKPOINT_WATCHER;	116	our $BDB_CHECKPOINT_WATCHER;
106	our $BDB_TRICKLE_WATCHER;	117	our $BDB_TRICKLE_WATCHER;
107	our $DB_ENV;	118	our $DB_ENV;
108		119
		120	our @EXTRA_MODULES = qw(pod mapscript);
		121
109	our %CFG;	122	our %CFG;
110		123
111	our $UPTIME; $UPTIME \|\|= time;	124	our $UPTIME; $UPTIME \|\|= time;
112	our $RUNTIME;	125	our $RUNTIME;
113	our $NOW;	126	our $NOW;
…		…
122	our $LOAD; # a number between 0 (idle) and 1 (too many objects)	135	our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123	our $LOADAVG; # same thing, but with alpha-smoothing	136	our $LOADAVG; # same thing, but with alpha-smoothing
124	our $JITTER; # average jitter	137	our $JITTER; # average jitter
125	our $TICK_START; # for load detecting purposes	138	our $TICK_START; # for load detecting purposes
126		139
		140	our @POST_INIT;
		141
		142	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
		143	our $REALLY_UNLOOP; # never set to true, please :)
		144
127	binmode STDOUT;	145	binmode STDOUT;
128	binmode STDERR;	146	binmode STDERR;
129		147
130	# read virtual server time, if available	148	# read virtual server time, if available
131	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {	149	unless ($RUNTIME \|\| !-e $RUNTIMEFILE) {
132	open my $fh, "<", "$LOCALDIR/runtime"	150	open my $fh, "<", $RUNTIMEFILE
133	or die "unable to read runtime file: $!";	151	or die "unable to read $RUNTIMEFILE file: $!";
134	$RUNTIME = <$fh> + 0.;	152	$RUNTIME = <$fh> + 0.;
135	}	153	}
		154
		155	eval "sub TICK() { $TICK } 1" or die;
136		156
137	mkdir $_	157	mkdir $_
138	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;	158	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139		159
140	our $EMERGENCY_POSITION;	160	our $EMERGENCY_POSITION;
…		…
299	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	319	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300		320
301	sub encode_json($) { $json_coder->encode ($_[0]) }	321	sub encode_json($) { $json_coder->encode ($_[0]) }
302	sub decode_json($) { $json_coder->decode ($_[0]) }	322	sub decode_json($) { $json_coder->decode ($_[0]) }
303		323
		324	=item cf::post_init { BLOCK }
		325
		326	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
		327	but I<before> the server starts ticking again.
		328
		329	The cdoeblock will have a single boolean argument to indicate whether this
		330	is a reload or not.
		331
		332	=cut
		333
		334	sub post_init(&) {
		335	push @POST_INIT, shift;
		336	}
		337
304	=item cf::lock_wait $string	338	=item cf::lock_wait $string
305		339
306	Wait until the given lock is available. See cf::lock_acquire.	340	Wait until the given lock is available. See cf::lock_acquire.
307		341
308	=item my $lock = cf::lock_acquire $string	342	=item my $lock = cf::lock_acquire $string
309		343
310	Wait until the given lock is available and then acquires it and returns	344	Wait until the given lock is available and then acquires it and returns
311	a Coro::guard object. If the guard object gets destroyed (goes out of scope,	345	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312	for example when the coroutine gets canceled), the lock is automatically	346	for example when the coroutine gets canceled), the lock is automatically
313	returned.	347	returned.
314		348
315	Locks are not recursive, locking from the same coro twice results in a	349	Locks are not recursive, locking from the same coro twice results in a
316	deadlocked coro.	350	deadlocked coro.
…		…
322		356
323	Return true if the lock is currently active, i.e. somebody has locked it.	357	Return true if the lock is currently active, i.e. somebody has locked it.
324		358
325	=cut	359	=cut
326		360
327	our %LOCK;	361	our $LOCKS = new Coro::SemaphoreSet;
328	our %LOCKER;#d#
329		362
330	sub lock_wait($) {	363	sub lock_wait($) {
331	my ($key) = @_;	364	$LOCKS->wait ($_[0]);
332
333	if ($LOCKER{$key} == $Coro::current) {#d#
334	Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335	return;#d#
336	}#d#
337
338	# wait for lock, if any
339	while ($LOCK{$key}) {
340	push @{ $LOCK{$key} }, $Coro::current;
341	Coro::schedule;
342	}
343	}	365	}
344		366
345	sub lock_acquire($) {	367	sub lock_acquire($) {
346	my ($key) = @_;	368	$LOCKS->guard ($_[0])
347
348	# wait, to be sure we are not locked
349	lock_wait $key;
350
351	$LOCK{$key} = [];
352	$LOCKER{$key} = $Coro::current;#d#
353
354	Coro::guard {
355	delete $LOCKER{$key};#d#
356	# wake up all waiters, to be on the safe side
357	$_->ready for @{ delete $LOCK{$key} };
358	}
359	}	369	}
360		370
361	sub lock_active($) {	371	sub lock_active($) {
362	my ($key) = @_;	372	$LOCKS->count ($_[0]) < 1
363
364	! ! $LOCK{$key}
365	}	373	}
366		374
367	sub freeze_mainloop {	375	sub freeze_mainloop {
368	tick_inhibit_inc;	376	tick_inhibit_inc;
369		377
370	Coro::guard \&tick_inhibit_dec;	378	&Guard::guard (\&tick_inhibit_dec);
371	}	379	}
372		380
373	=item cf::periodic $interval, $cb	381	=item cf::periodic $interval, $cb
374		382
375	Like EV::periodic, but randomly selects a starting point so that the actions	383	Like EV::periodic, but randomly selects a starting point so that the actions
…		…
727		735
728	#############################################################################	736	#############################################################################
729		737
730	=head2 ATTACHABLE OBJECTS	738	=head2 ATTACHABLE OBJECTS
731		739
732	Many objects in crossfire are so-called attachable objects. That means you can	740	Many objects in deliantra are so-called attachable objects. That means you can
733	attach callbacks/event handlers (a collection of which is called an "attachment")	741	attach callbacks/event handlers (a collection of which is called an "attachment")
734	to it. All such attachable objects support the following methods.	742	to it. All such attachable objects support the following methods.
735		743
736	In the following description, CLASS can be any of C<global>, C<object>	744	In the following description, CLASS can be any of C<global>, C<object>
737	C<player>, C<client> or C<map> (i.e. the attachable objects in	745	C<player>, C<client> or C<map> (i.e. the attachable objects in
…		…
787	=item cf::CLASS::attachment $name, ...	795	=item cf::CLASS::attachment $name, ...
788		796
789	Register an attachment by C<$name> through which attachable objects of the	797	Register an attachment by C<$name> through which attachable objects of the
790	given CLASS can refer to this attachment.	798	given CLASS can refer to this attachment.
791		799
792	Some classes such as crossfire maps and objects can specify attachments	800	Some classes such as deliantra maps and objects can specify attachments
793	that are attached at load/instantiate time, thus the need for a name.	801	that are attached at load/instantiate time, thus the need for a name.
794		802
795	These calls expect any number of the following handler/hook descriptions:	803	These calls expect any number of the following handler/hook descriptions:
796		804
797	=over 4	805	=over 4
…		…
1147	$decname, length $$rdata, scalar @$objs;	1155	$decname, length $$rdata, scalar @$objs;
1148		1156
1149	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {	1157	if (my $fh = aio_open "$filename~", O_WRONLY \| O_CREAT, 0600) {
1150	aio_chmod $fh, SAVE_MODE;	1158	aio_chmod $fh, SAVE_MODE;
1151	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1159	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152	aio_fsync $fh if $cf::USE_FSYNC;	1160	if ($cf::USE_FSYNC) {
		1161	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1162	aio_fsync $fh;
		1163	}
1153	aio_close $fh;	1164	aio_close $fh;
1154		1165
1155	if (@$objs) {	1166	if (@$objs) {
1156	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {	1167	if (my $fh = aio_open "$filename.pst~", O_WRONLY \| O_CREAT, 0600) {
1157	aio_chmod $fh, SAVE_MODE;	1168	aio_chmod $fh, SAVE_MODE;
1158	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };	1169	my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159	aio_write $fh, 0, (length $data), $data, 0;	1170	aio_write $fh, 0, (length $data), $data, 0;
1160	aio_fsync $fh if $cf::USE_FSYNC;	1171	if ($cf::USE_FSYNC) {
		1172	aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE \| IO::AIO::SYNC_FILE_RANGE_WRITE \| IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
		1173	aio_fsync $fh;
		1174	}
1161	aio_close $fh;	1175	aio_close $fh;
1162	aio_rename "$filename.pst~", "$filename.pst";	1176	aio_rename "$filename.pst~", "$filename.pst";
1163	}	1177	}
1164	} else {	1178	} else {
1165	aio_unlink "$filename.pst";	1179	aio_unlink "$filename.pst";
1166	}	1180	}
1167		1181
1168	aio_rename "$filename~", $filename;	1182	aio_rename "$filename~", $filename;
		1183
		1184	$filename =~ s%/[^/]+$%%;
		1185	aio_pathsync $filename if $cf::USE_FSYNC;
1169	} else {	1186	} else {
1170	warn "FATAL: $filename~: $!\n";	1187	warn "unable to save objects: $filename~: $!\n";
1171	}	1188	}
1172	} else {	1189	} else {
1173	aio_unlink $filename;	1190	aio_unlink $filename;
1174	aio_unlink "$filename.pst";	1191	aio_unlink "$filename.pst";
1175	}	1192	}
…		…
1266	my ($name, $cb) = @_;	1283	my ($name, $cb) = @_;
1267		1284
1268	$EXTICMD{$name} = $cb;	1285	$EXTICMD{$name} = $cb;
1269	}	1286	}
1270		1287
		1288	use File::Glob ();
		1289
1271	cf::player->attach (	1290	cf::player->attach (
1272	on_command => sub {	1291	on_command => sub {
1273	my ($pl, $name, $params) = @_;	1292	my ($pl, $name, $params) = @_;
1274		1293
1275	my $cb = $COMMAND{$name}	1294	my $cb = $COMMAND{$name}
…		…
1306	}	1325	}
1307		1326
1308	cf::override;	1327	cf::override;
1309	},	1328	},
1310	);	1329	);
		1330
		1331	# "readahead" all extensions
		1332	sub cache_extensions {
		1333	my $grp = IO::AIO::aio_group;
		1334
		1335	add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
		1336	for (grep /\.ext$/, @{$_[0]}) {
		1337	add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
		1338	}
		1339	};
		1340
		1341	$grp
		1342	}
1311		1343
1312	sub load_extensions {	1344	sub load_extensions {
1313	cf::sync_job {	1345	cf::sync_job {
1314	my %todo;	1346	my %todo;
1315		1347
…		…
1385		1417
1386	=back	1418	=back
1387		1419
1388	=head2 CORE EXTENSIONS	1420	=head2 CORE EXTENSIONS
1389		1421
1390	Functions and methods that extend core crossfire objects.	1422	Functions and methods that extend core deliantra objects.
1391		1423
1392	=cut	1424	=cut
1393		1425
1394	package cf::player;	1426	package cf::player;
1395		1427
…		…
1438		1470
1439	sub exists($) {	1471	sub exists($) {
1440	my ($login) = @_;	1472	my ($login) = @_;
1441		1473
1442	$cf::PLAYER{$login}	1474	$cf::PLAYER{$login}
1443	or cf::sync_job { !aio_stat path $login }	1475	or !aio_stat path $login
1444	}	1476	}
1445		1477
1446	sub find($) {	1478	sub find($) {
1447	return $cf::PLAYER{$_[0]} \|\| do {	1479	return $cf::PLAYER{$_[0]} \|\| do {
1448	my $login = $_[0];	1480	my $login = $_[0];
…		…
1619	}	1651	}
1620		1652
1621	\@paths	1653	\@paths
1622	}	1654	}
1623		1655
1624	=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)	1656	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625		1657
1626	Expand crossfire pod fragments into protocol xml.	1658	Expand deliantra pod fragments into protocol xml.
1627		1659
1628	=item $player->ext_reply ($msgid, @msg)	1660	=item $player->ext_reply ($msgid, @msg)
1629		1661
1630	Sends an ext reply to the player.	1662	Sends an ext reply to the player.
1631		1663
…		…
1844		1876
1845	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;	1877	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846	"$UNIQUEDIR/$path"	1878	"$UNIQUEDIR/$path"
1847	}	1879	}
1848		1880
1849	# and all this just because we cannot iterate over
1850	# all maps in C++...
1851	sub change_all_map_light {
1852	my ($change) = @_;
1853
1854	$_->change_map_light ($change)
1855	for grep $_->outdoor, values %cf::MAP;
1856	}
1857
1858	sub decay_objects {	1881	sub decay_objects {
1859	my ($self) = @_;	1882	my ($self) = @_;
1860		1883
1861	return if $self->{deny_reset};	1884	return if $self->{deny_reset};
1862		1885
…		…
1944	sub find {	1967	sub find {
1945	my ($path, $origin) = @_;	1968	my ($path, $origin) = @_;
1946		1969
1947	$path = normalise $path, $origin && $origin->path;	1970	$path = normalise $path, $origin && $origin->path;
1948		1971
1949	cf::lock_wait "map_data:$path";#d#remove	1972	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950	cf::lock_wait "map_find:$path";	1973	my $guard2 = cf::lock_acquire "map_find:$path";
1951		1974
1952	$cf::MAP{$path} \|\| do {	1975	$cf::MAP{$path} \|\| do {
1953	my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954	my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956	my $map = new_from_path cf::map $path	1976	my $map = new_from_path cf::map $path
1957	or return;	1977	or return;
1958		1978
1959	$map->{last_save} = $cf::RUNTIME;	1979	$map->{last_save} = $cf::RUNTIME;
1960		1980
…		…
2027		2047
2028	unless ($self->{deny_activate}) {	2048	unless ($self->{deny_activate}) {
2029	$self->decay_objects;	2049	$self->decay_objects;
2030	$self->fix_auto_apply;	2050	$self->fix_auto_apply;
2031	$self->update_buttons;	2051	$self->update_buttons;
2032	cf::cede_to_tick;
2033	$self->set_darkness_map;
2034	cf::cede_to_tick;	2052	cf::cede_to_tick;
2035	$self->activate;	2053	$self->activate;
2036	}	2054	}
2037		2055
2038	$self->{last_save} = $cf::RUNTIME;	2056	$self->{last_save} = $cf::RUNTIME;
…		…
2380		2398
2381	our $SAY_CHANNEL = {	2399	our $SAY_CHANNEL = {
2382	id => "say",	2400	id => "say",
2383	title => "Map",	2401	title => "Map",
2384	reply => "say ",	2402	reply => "say ",
2385	tooltip => "Things said to and replied from npcs near you and other players on the same map only.",	2403	tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386	};	2404	};
2387		2405
2388	our $CHAT_CHANNEL = {	2406	our $CHAT_CHANNEL = {
2389	id => "chat",	2407	id => "chat",
2390	title => "Chat",	2408	title => "Chat",
…		…
2445		2463
2446	=item $player_object->enter_link	2464	=item $player_object->enter_link
2447		2465
2448	Freezes the player and moves him/her to a special map (C<{link}>).	2466	Freezes the player and moves him/her to a special map (C<{link}>).
2449		2467
2450	The player should be reasonably safe there for short amounts of time. You	2468	The player should be reasonably safe there for short amounts of time (e.g.
2451	I<MUST> call C<leave_link> as soon as possible, though.	2469	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
		2470	though, as the palyer cannot control the character while it is on the link
		2471	map.
2452		2472
2453	Will never block.	2473	Will never block.
2454		2474
2455	=item $player_object->leave_link ($map, $x, $y)	2475	=item $player_object->leave_link ($map, $x, $y)
2456		2476
…		…
2514		2534
2515	$map->load;	2535	$map->load;
2516	$map->load_neighbours;	2536	$map->load_neighbours;
2517		2537
2518	return unless $self->contr->active;	2538	return unless $self->contr->active;
		2539	$self->flag (cf::FLAG_DEBUG, 0);#d# temp
2519	$self->activate_recursive;	2540	$self->activate_recursive;
2520		2541
2521	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2542	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522	$self->enter_map ($map, $x, $y);	2543	$self->enter_map ($map, $x, $y);
2523	}	2544	}
…		…
2686	$self->contr->savebed ($map, $x, $y)	2707	$self->contr->savebed ($map, $x, $y)
2687	if $exit->flag (cf::FLAG_DAMNED);	2708	if $exit->flag (cf::FLAG_DAMNED);
2688		2709
2689	1	2710	1
2690	}) {	2711	}) {
2691	$self->message ("Something went wrong deep within the crossfire server. "	2712	$self->message ("Something went wrong deep within the deliantra server. "
2692	. "I'll try to bring you back to the map you were before. "	2713	. "I'll try to bring you back to the map you were before. "
2693	. "Please report this to the dungeon master!",	2714	. "Please report this to the dungeon master!",
2694	cf::NDI_UNIQUE \| cf::NDI_RED);	2715	cf::NDI_UNIQUE \| cf::NDI_RED);
2695		2716
2696	warn "ERROR in enter_exit: $@";	2717	warn "ERROR in enter_exit: $@";
…		…
2762	id => "infobox",	2783	id => "infobox",
2763	title => "Body Parts",	2784	title => "Body Parts",
2764	reply => undef,	2785	reply => undef,
2765	tooltip => "Shows which body parts you posess and are available",	2786	tooltip => "Shows which body parts you posess and are available",
2766	},	2787	},
		2788	"c/statistics" => {
		2789	id => "infobox",
		2790	title => "Statistics",
		2791	reply => undef,
		2792	tooltip => "Shows your primary statistics",
		2793	},
		2794	"c/skills" => {
		2795	id => "infobox",
		2796	title => "Skills",
		2797	reply => undef,
		2798	tooltip => "Shows your experience per skill and item power",
		2799	},
		2800	"c/shopitems" => {
		2801	id => "infobox",
		2802	title => "Shop Items",
		2803	reply => undef,
		2804	tooltip => "Shows the items currently for sale in this shop",
		2805	},
		2806	"c/resistances" => {
		2807	id => "infobox",
		2808	title => "Resistances",
		2809	reply => undef,
		2810	tooltip => "Shows your resistances",
		2811	},
		2812	"c/pets" => {
		2813	id => "infobox",
		2814	title => "Pets",
		2815	reply => undef,
		2816	tooltip => "Shows information abotu your pets/a specific pet",
		2817	},
		2818	"c/perceiveself" => {
		2819	id => "infobox",
		2820	title => "Perceive Self",
		2821	reply => undef,
		2822	tooltip => "You gained detailed knowledge about yourself",
		2823	},
2767	"c/uptime" => {	2824	"c/uptime" => {
2768	id => "infobox",	2825	id => "infobox",
2769	title => "Uptime",	2826	title => "Uptime",
2770	reply => undef,	2827	reply => undef,
2771	tooltip => "How long the server has been running since last restart",	2828	tooltip => "How long the server has been running since last restart",
…		…
2780	id => "party",	2837	id => "party",
2781	title => "Party",	2838	title => "Party",
2782	reply => "gsay ",	2839	reply => "gsay ",
2783	tooltip => "Messages and chat related to your party",	2840	tooltip => "Messages and chat related to your party",
2784	},	2841	},
		2842	"c/death" => {
		2843	id => "death",
		2844	title => "Death",
		2845	reply => undef,
		2846	tooltip => "Reason for and more info about your most recent death",
		2847	},
		2848	"c/say" => $SAY_CHANNEL,
		2849	"c/chat" => $CHAT_CHANNEL,
2785	);	2850	);
2786		2851
2787	sub cf::client::send_msg {	2852	sub cf::client::send_msg {
2788	my ($self, $channel, $msg, $color, @extra) = @_;	2853	my ($self, $channel, $msg, $color, @extra) = @_;
2789		2854
2790	$msg = $self->pl->expand_cfpod ($msg);	2855	$msg = $self->pl->expand_cfpod ($msg)
		2856	unless $color & cf::NDI_VERBATIM;
2791		2857
2792	$color &= cf::NDI_CLIENT_MASK; # just in case...	2858	$color &= cf::NDI_CLIENT_MASK; # just in case...
2793		2859
2794	# check predefined channels, for the benefit of C	2860	# check predefined channels, for the benefit of C
2795	if ($CHANNEL{$channel}) {	2861	if ($CHANNEL{$channel}) {
2796	$channel = $CHANNEL{$channel};	2862	$channel = $CHANNEL{$channel};
2797		2863
2798	$self->ext_msg (channel_info => $channel)	2864	$self->ext_msg (channel_info => $channel);
2799	if $self->can_msg;
2800
2801	$channel = $channel->{id};	2865	$channel = $channel->{id};
2802		2866
2803	} elsif (ref $channel) {	2867	} elsif (ref $channel) {
2804	# send meta info to client, if not yet sent	2868	# send meta info to client, if not yet sent
2805	unless (exists $self->{channel}{$channel->{id}}) {	2869	unless (exists $self->{channel}{$channel->{id}}) {
2806	$self->{channel}{$channel->{id}} = $channel;	2870	$self->{channel}{$channel->{id}} = $channel;
2807	$self->ext_msg (channel_info => $channel)	2871	$self->ext_msg (channel_info => $channel);
2808	if $self->can_msg;
2809	}	2872	}
2810		2873
2811	$channel = $channel->{id};	2874	$channel = $channel->{id};
2812	}	2875	}
2813		2876
2814	return unless @extra \|\| length $msg;	2877	return unless @extra \|\| length $msg;
2815		2878
2816	if ($self->can_msg) {
2817	# default colour, mask it out	2879	# default colour, mask it out
2818	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)	2880	$color &= ~(cf::NDI_COLOR_MASK \| cf::NDI_DEF)
2819	if $color & cf::NDI_DEF;	2881	if $color & cf::NDI_DEF;
2820		2882
2821	my $pkt = "msg "	2883	my $pkt = "msg "
2822	. $self->{json_coder}->encode (	2884	. $self->{json_coder}->encode (
2823	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	2885	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824	);	2886	);
2825		2887
2826	# try lzf for large packets	2888	# try lzf for large packets
2827	$pkt = "lzf " . Compress::LZF::compress $pkt	2889	$pkt = "lzf " . Compress::LZF::compress $pkt
2828	if 1024 <= length $pkt and $self->{can_lzf};	2890	if 1024 <= length $pkt and $self->{can_lzf};
2829		2891
2830	# split very large packets	2892	# split very large packets
2831	if (8192 < length $pkt and $self->{can_lzf}) {	2893	if (8192 < length $pkt and $self->{can_lzf}) {
2832	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;	2894	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833	$pkt = "frag";	2895	$pkt = "frag";
2834	}	2896	}
2835		2897
2836	$self->send_packet ($pkt);	2898	$self->send_packet ($pkt);
2837	} else {
2838	if ($color >= 0) {
2839	# replace some tags by gcfclient-compatible ones
2840	for ($msg) {
2841	1 while
2842	s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843	\|\| s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844	\|\| s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845	\|\| s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846	\|\| s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847	}
2848
2849	$color &= cf::NDI_COLOR_MASK;
2850
2851	utf8::encode $msg;
2852
2853	if (0 && $msg =~ /\[/) {
2854	# COMMAND/INFO
2855	$self->send_packet ("drawextinfo $color 10 8 $msg")
2856	} else {
2857	$msg =~ s/\[\/?(?:b\|i\|u\|fixed\|color)[^\]]*\]//g;
2858	$self->send_packet ("drawinfo $color $msg")
2859	}
2860	}
2861	}
2862	}	2899	}
2863		2900
2864	=item $client->ext_msg ($type, @msg)	2901	=item $client->ext_msg ($type, @msg)
2865		2902
2866	Sends an ext event to the client.	2903	Sends an ext event to the client.
…		…
3041	The following functions and methods are available within a safe environment:	3078	The following functions and methods are available within a safe environment:
3042		3079
3043	cf::object	3080	cf::object
3044	contr pay_amount pay_player map x y force_find force_add destroy	3081	contr pay_amount pay_player map x y force_find force_add destroy
3045	insert remove name archname title slaying race decrease split	3082	insert remove name archname title slaying race decrease split
		3083	value
3046		3084
3047	cf::object::player	3085	cf::object::player
3048	player	3086	player
3049		3087
3050	cf::player	3088	cf::player
…		…
3056	=cut	3094	=cut
3057		3095
3058	for (	3096	for (
3059	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y	3097	["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060	insert remove inv nrof name archname title slaying race	3098	insert remove inv nrof name archname title slaying race
3061	decrease split destroy change_exp)],	3099	decrease split destroy change_exp value msg lore send_msg)],
3062	["cf::object::player" => qw(player)],	3100	["cf::object::player" => qw(player)],
3063	["cf::player" => qw(peaceful)],	3101	["cf::player" => qw(peaceful send_msg)],
3064	["cf::map" => qw(trigger)],	3102	["cf::map" => qw(trigger)],
3065	) {	3103	) {
3066	no strict 'refs';	3104	no strict 'refs';
3067	my ($pkg, @funs) = @$_;	3105	my ($pkg, @funs) = @$_;
3068	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3106	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
…		…
3085	my ($code, %vars) = @_;	3123	my ($code, %vars) = @_;
3086		3124
3087	my $qcode = $code;	3125	my $qcode = $code;
3088	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3126	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3089	$qcode =~ s/\n/\\n/g;	3127	$qcode =~ s/\n/\\n/g;
		3128
		3129	%vars = (_dummy => 0) unless %vars;
3090		3130
3091	local $_;	3131	local $_;
3092	local @safe::cf::_safe_eval_args = values %vars;	3132	local @safe::cf::_safe_eval_args = values %vars;
3093		3133
3094	my $eval =	3134	my $eval =
…		…
3324	reload_treasures;	3364	reload_treasures;
3325		3365
3326	warn "finished reloading resource files\n";	3366	warn "finished reloading resource files\n";
3327	}	3367	}
3328		3368
3329	sub init {
3330	my $guard = freeze_mainloop;
3331
3332	evthread_start IO::AIO::poll_fileno;
3333
3334	reload_resources;
3335	}
3336
3337	sub reload_config {	3369	sub reload_config {
3338	open my $fh, "<:utf8", "$CONFDIR/config"	3370	open my $fh, "<:utf8", "$CONFDIR/config"
3339	or return;	3371	or return;
3340		3372
3341	local $/;	3373	local $/;
…		…
3353	};	3385	};
3354	warn $@ if $@;	3386	warn $@ if $@;
3355	}	3387	}
3356	}	3388	}
3357		3389
		3390	sub pidfile() {
		3391	sysopen my $fh, $PIDFILE, O_RDWR \| O_CREAT
		3392	or die "$PIDFILE: $!";
		3393	flock $fh, &Fcntl::LOCK_EX
		3394	or die "$PIDFILE: flock: $!";
		3395	$fh
		3396	}
		3397
		3398	# make sure only one server instance is running at any one time
		3399	sub atomic {
		3400	my $fh = pidfile;
		3401
		3402	my $pid = <$fh>;
		3403	kill 9, $pid if $pid > 0;
		3404
		3405	seek $fh, 0, 0;
		3406	print $fh $$;
		3407	}
		3408
		3409	sub main_loop {
		3410	warn "EV::loop starting\n";
		3411	if (1) {
		3412	EV::loop;
		3413	}
		3414	warn "EV::loop returned\n";
		3415	goto &main_loop unless $REALLY_UNLOOP;
		3416	}
		3417
3358	sub main {	3418	sub main {
		3419	cf::init_globals; # initialise logging
		3420
		3421	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3422	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
		3423	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
		3424	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
		3425
		3426	cf::init_experience;
		3427	cf::init_anim;
		3428	cf::init_attackmess;
		3429	cf::init_dynamic;
		3430
		3431	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
		3432
3359	# we must not ever block the main coroutine	3433	# we must not ever block the main coroutine
3360	local $Coro::idle = sub {	3434	local $Coro::idle = sub {
3361	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3435	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362	(async {	3436	(async {
3363	$Coro::current->{desc} = "IDLE BUG HANDLER";	3437	$Coro::current->{desc} = "IDLE BUG HANDLER";
3364	EV::loop EV::LOOP_ONESHOT;	3438	EV::loop EV::LOOP_ONESHOT;
3365	})->prio (Coro::PRIO_MAX);	3439	})->prio (Coro::PRIO_MAX);
3366	};	3440	};
3367		3441
3368	{	3442	evthread_start IO::AIO::poll_fileno;
3369	my $guard = freeze_mainloop;	3443
		3444	cf::sync_job {
		3445	reload_resources;
3370	reload_config;	3446	reload_config;
3371	db_init;	3447	db_init;
		3448
		3449	cf::load_settings;
		3450	cf::load_materials;
		3451	cf::init_uuid;
		3452	cf::init_signals;
		3453	cf::init_commands;
		3454	cf::init_skills;
		3455
		3456	cf::init_beforeplay;
		3457
		3458	atomic;
		3459
3372	load_extensions;	3460	load_extensions;
3373		3461
3374	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3462	utime time, time, $RUNTIMEFILE;
		3463
		3464	# no (long-running) fork's whatsoever before this point(!)
		3465	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
		3466
		3467	(pop @POST_INIT)->(0) while @POST_INIT;
3375	}	3468	};
3376		3469
3377	EV::loop;	3470	main_loop;
3378	}	3471	}
3379		3472
3380	#############################################################################	3473	#############################################################################
3381	# initialisation and cleanup	3474	# initialisation and cleanup
3382		3475
…		…
3389	};	3482	};
3390	}	3483	}
3391	}	3484	}
3392		3485
3393	sub write_runtime_sync {	3486	sub write_runtime_sync {
3394	my $runtime = "$LOCALDIR/runtime";
3395
3396	# first touch the runtime file to show we are still running:	3487	# first touch the runtime file to show we are still running:
3397	# the fsync below can take a very very long time.	3488	# the fsync below can take a very very long time.
3398		3489
3399	IO::AIO::aio_utime $runtime, undef, undef;	3490	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400		3491
3401	my $guard = cf::lock_acquire "write_runtime";	3492	my $guard = cf::lock_acquire "write_runtime";
3402		3493
3403	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	3494	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY \| O_CREAT, 0644
3404	or return;	3495	or return;
3405		3496
3406	my $value = $cf::RUNTIME + 90 + 10;	3497	my $value = $cf::RUNTIME + 90 + 10;
3407	# 10 is the runtime save interval, for a monotonic clock	3498	# 10 is the runtime save interval, for a monotonic clock
3408	# 60 allows for the watchdog to kill the server.	3499	# 60 allows for the watchdog to kill the server.
…		…
3418	aio_utime $fh, undef, undef;	3509	aio_utime $fh, undef, undef;
3419		3510
3420	close $fh	3511	close $fh
3421	or return;	3512	or return;
3422		3513
3423	aio_rename "$runtime~", $runtime	3514	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424	and return;	3515	and return;
3425		3516
3426	warn "runtime file written.\n";	3517	warn "runtime file written.\n";
3427		3518
3428	1	3519	1
…		…
3440	my $uuid = "$LOCALDIR/uuid";	3531	my $uuid = "$LOCALDIR/uuid";
3441		3532
3442	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644	3533	my $fh = aio_open "$uuid~", O_WRONLY \| O_CREAT, 0644
3443	or return;	3534	or return;
3444		3535
3445	my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;	3536	my $value = uuid_seq uuid_cur;
		3537
		3538	unless ($value) {
		3539	warn "cowardly refusing to write zero uuid value!\n";
		3540	return;
		3541	}
		3542
		3543	my $value = uuid_str $value + $uuid_skip;
3446	$uuid_skip = 0;	3544	$uuid_skip = 0;
3447		3545
3448	(aio_write $fh, 0, (length $value), $value, 0) <= 0	3546	(aio_write $fh, 0, (length $value), $value, 0) <= 0
3449	and return;	3547	and return;
3450		3548
…		…
3472	}	3570	}
3473		3571
3474	sub emergency_save() {	3572	sub emergency_save() {
3475	my $freeze_guard = cf::freeze_mainloop;	3573	my $freeze_guard = cf::freeze_mainloop;
3476		3574
3477	warn "enter emergency perl save\n";	3575	warn "emergency_perl_save: enter\n";
3478		3576
3479	cf::sync_job {	3577	cf::sync_job {
		3578	# this is a trade-off: we want to be very quick here, so
		3579	# save all maps without fsync, and later call a global sync
		3580	# (which in turn might be very very slow)
		3581	local $USE_FSYNC = 0;
		3582
3480	# use a peculiar iteration method to avoid tripping on perl	3583	# use a peculiar iteration method to avoid tripping on perl
3481	# refcount bugs in for. also avoids problems with players	3584	# refcount bugs in for. also avoids problems with players
3482	# and maps saved/destroyed asynchronously.	3585	# and maps saved/destroyed asynchronously.
3483	warn "begin emergency player save\n";	3586	warn "emergency_perl_save: begin player save\n";
3484	for my $login (keys %cf::PLAYER) {	3587	for my $login (keys %cf::PLAYER) {
3485	my $pl = $cf::PLAYER{$login} or next;	3588	my $pl = $cf::PLAYER{$login} or next;
3486	$pl->valid or next;	3589	$pl->valid or next;
3487	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3590	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488	$pl->save;	3591	$pl->save;
3489	}	3592	}
3490	warn "end emergency player save\n";	3593	warn "emergency_perl_save: end player save\n";
3491		3594
3492	warn "begin emergency map save\n";	3595	warn "emergency_perl_save: begin map save\n";
3493	for my $path (keys %cf::MAP) {	3596	for my $path (keys %cf::MAP) {
3494	my $map = $cf::MAP{$path} or next;	3597	my $map = $cf::MAP{$path} or next;
3495	$map->valid or next;	3598	$map->valid or next;
3496	$map->save;	3599	$map->save;
3497	}	3600	}
3498	warn "end emergency map save\n";	3601	warn "emergency_perl_save: end map save\n";
3499		3602
3500	warn "begin emergency database checkpoint\n";	3603	warn "emergency_perl_save: begin database checkpoint\n";
3501	BDB::db_env_txn_checkpoint $DB_ENV;	3604	BDB::db_env_txn_checkpoint $DB_ENV;
3502	warn "end emergency database checkpoint\n";	3605	warn "emergency_perl_save: end database checkpoint\n";
3503		3606
3504	warn "begin write uuid\n";	3607	warn "emergency_perl_save: begin write uuid\n";
3505	write_uuid_sync 1;	3608	write_uuid_sync 1;
3506	warn "end write uuid\n";	3609	warn "emergency_perl_save: end write uuid\n";
3507	};	3610	};
3508		3611
		3612	warn "emergency_perl_save: starting sync()\n";
		3613	IO::AIO::aio_sync sub {
		3614	warn "emergency_perl_save: finished sync()\n";
		3615	};
		3616
3509	warn "leave emergency perl save\n";	3617	warn "emergency_perl_save: leave\n";
3510	}	3618	}
3511		3619
3512	sub post_cleanup {	3620	sub post_cleanup {
3513	my ($make_core) = @_;	3621	my ($make_core) = @_;
3514		3622
3515	warn Carp::longmess "post_cleanup backtrace"	3623	warn Carp::longmess "post_cleanup backtrace"
3516	if $make_core;	3624	if $make_core;
		3625
		3626	my $fh = pidfile;
		3627	unlink $PIDFILE if <$fh> == $$;
3517	}	3628	}
3518		3629
3519	# a safer delete_package, copied from Symbol	3630	# a safer delete_package, copied from Symbol
3520	sub clear_package($) {	3631	sub clear_package($) {
3521	my $pkg = shift;	3632	my $pkg = shift;
…		…
3537	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3648	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538	for my $name (keys %$leaf_symtab) {	3649	for my $name (keys %$leaf_symtab) {
3539	_gv_clear *{"$pkg$name"};	3650	_gv_clear *{"$pkg$name"};
3540	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3651	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541	}	3652	}
3542	warn "cleared package #$pkg\n";#d#	3653	warn "cleared package $pkg\n";#d#
3543	}	3654	}
3544
3545	our $RELOAD; # how many times to reload
3546		3655
3547	sub do_reload_perl() {	3656	sub do_reload_perl() {
3548	# can/must only be called in main	3657	# can/must only be called in main
3549	if ($Coro::current != $Coro::main) {	3658	if ($Coro::current != $Coro::main) {
3550	warn "can only reload from main coroutine";	3659	warn "can only reload from main coroutine";
3551	return;	3660	return;
3552	}	3661	}
3553		3662
3554	return if $RELOAD++;	3663	return if $RELOAD++;
		3664
		3665	my $t1 = EV::time;
3555		3666
3556	while ($RELOAD) {	3667	while ($RELOAD) {
3557	warn "reloading...";	3668	warn "reloading...";
3558		3669
3559	warn "entering sync_job";	3670	warn "entering sync_job";
…		…
3620	clear_package "safe::$_"	3731	clear_package "safe::$_"
3621	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	3732	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622		3733
3623	warn "unloading cf.pm \"a bit\"";	3734	warn "unloading cf.pm \"a bit\"";
3624	delete $INC{"cf.pm"};	3735	delete $INC{"cf.pm"};
3625	delete $INC{"cf/pod.pm"};	3736	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626		3737
3627	# don't, removes xs symbols, too,	3738	# don't, removes xs symbols, too,
3628	# and global variables created in xs	3739	# and global variables created in xs
3629	#clear_package __PACKAGE__;	3740	#clear_package __PACKAGE__;
3630		3741
…		…
3638	cf::reload_config;	3749	cf::reload_config;
3639		3750
3640	warn "loading extensions";	3751	warn "loading extensions";
3641	cf::load_extensions;	3752	cf::load_extensions;
3642		3753
		3754	if ($REATTACH_ON_RELOAD) {
3643	warn "reattaching attachments to objects/players";	3755	warn "reattaching attachments to objects/players";
3644	_global_reattach; # objects, sockets	3756	_global_reattach; # objects, sockets
3645	warn "reattaching attachments to maps";	3757	warn "reattaching attachments to maps";
3646	reattach $_ for values %MAP;	3758	reattach $_ for values %MAP;
3647	warn "reattaching attachments to players";	3759	warn "reattaching attachments to players";
3648	reattach $_ for values %PLAYER;	3760	reattach $_ for values %PLAYER;
		3761	}
		3762
		3763	warn "running post_init jobs";
		3764	(pop @POST_INIT)->(1) while @POST_INIT;
3649		3765
3650	warn "leaving sync_job";	3766	warn "leaving sync_job";
3651		3767
3652	1	3768	1
3653	} or do {	3769	} or do {
…		…
3656	};	3772	};
3657		3773
3658	warn "reloaded";	3774	warn "reloaded";
3659	--$RELOAD;	3775	--$RELOAD;
3660	}	3776	}
		3777
		3778	$t1 = EV::time - $t1;
		3779	warn "reload completed in ${t1}s\n";
3661	};	3780	};
3662		3781
3663	our $RELOAD_WATCHER; # used only during reload	3782	our $RELOAD_WATCHER; # used only during reload
3664		3783
3665	sub reload_perl() {	3784	sub reload_perl() {
3666	# doing reload synchronously and two reloads happen back-to-back,	3785	# doing reload synchronously and two reloads happen back-to-back,
3667	# coro crashes during coro_state_free->destroy here.	3786	# coro crashes during coro_state_free->destroy here.
3668		3787
		3788	$RELOAD_WATCHER \|\|= cf::async {
		3789	Coro::AIO::aio_wait cache_extensions;
		3790
3669	$RELOAD_WATCHER \|\|= EV::timer 0, 0, sub {	3791	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670	do_reload_perl;	3792	do_reload_perl;
3671	undef $RELOAD_WATCHER;	3793	undef $RELOAD_WATCHER;
		3794	};
3672	};	3795	};
3673	}	3796	}
3674		3797
3675	register_command "reload" => sub {	3798	register_command "reload" => sub {
3676	my ($who, $arg) = @_;	3799	my ($who, $arg) = @_;
…		…
3802	$msg =~ s/\n//;	3925	$msg =~ s/\n//;
3803		3926
3804	# limit the # of concurrent backtraces	3927	# limit the # of concurrent backtraces
3805	if ($_log_backtrace < 2) {	3928	if ($_log_backtrace < 2) {
3806	++$_log_backtrace;	3929	++$_log_backtrace;
		3930	my $perl_bt = Carp::longmess $msg;
3807	async {	3931	async {
3808	$Coro::current->{desc} = "abt $msg";	3932	$Coro::current->{desc} = "abt $msg";
3809		3933
3810	my @bt = fork_call {	3934	my @bt = fork_call {
3811	@addr = map { sprintf "%x", $_ } @addr;	3935	@addr = map { sprintf "%x", $_ } @addr;
…		…
3822	}	3946	}
3823		3947
3824	@funcs	3948	@funcs
3825	};	3949	};
3826		3950
3827	LOG llevInfo, "[ABT] $msg\n";	3951	LOG llevInfo, "[ABT] $perl_bt\n";
		3952	LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828	LOG llevInfo, "[ABT] $_\n" for @bt;	3953	LOG llevInfo, "[ABT] $_\n" for @bt;
3829	--$_log_backtrace;	3954	--$_log_backtrace;
3830	};	3955	};
3831	} else {	3956	} else {
3832	LOG llevInfo, "[ABT] $msg\n";	3957	LOG llevInfo, "[ABT] $msg\n";
3833	LOG llevInfo, "[ABT] [suppressed]\n";	3958	LOG llevInfo, "[ABT] [suppressed]\n";
3834	}	3959	}
3835	}	3960	}
3836		3961
3837	# load additional modules	3962	# load additional modules
3838	use cf::pod;	3963	require "cf/$_.pm" for @EXTRA_MODULES;
3839		3964
3840	END { cf::emergency_save }	3965	END { cf::emergency_save }
3841		3966
3842	1	3967	1
3843		3968

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs. Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 UTC