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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.230 by root, Mon Apr 2 18:04:46 2007 UTC vs.
Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
…		…
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
31	# configure various modules to our taste	34	# configure various modules to our taste
32	#	35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
33	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35		39
36	$Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
37		41
…		…
52		56
53	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
54	our @EVENT;	58	our @EVENT;
55	our $LIBDIR = datadir . "/ext";	59	our $LIBDIR = datadir . "/ext";
56		60
57	our $TICK = MAX_TIME * 1e-6;	61	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58	our $TICK_WATCHER;	62	our $TICK_WATCHER;
59	our $AIO_POLL_WATCHER;	63	our $AIO_POLL_WATCHER;
60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	64	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61	our $NEXT_TICK;	65	our $NEXT_TICK;
62	our $NOW;	66	our $NOW;
…		…
74	our %MAP; # all maps	78	our %MAP; # all maps
75	our $LINK_MAP; # the special {link} map, which is always available	79	our $LINK_MAP; # the special {link} map, which is always available
76	our $RANDOM_MAPS = cf::localdir . "/random";	80	our $RANDOM_MAPS = cf::localdir . "/random";
77	our $BDB_ENV_DIR = cf::localdir . "/db";	81	our $BDB_ENV_DIR = cf::localdir . "/db";
78		82
79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
80	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
81
82	# used to convert map paths into valid unix filenames by replacing / by ∕	83	# used to convert map paths into valid unix filenames by replacing / by ∕
83	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	84	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84		85
85	binmode STDOUT;	86	binmode STDOUT;
86	binmode STDERR;	87	binmode STDERR;
…		…
134	=item %cf::CFG	135	=item %cf::CFG
135		136
136	Configuration for the server, loaded from C</etc/crossfire/config>, or	137	Configuration for the server, loaded from C</etc/crossfire/config>, or
137	from wherever your confdir points to.	138	from wherever your confdir points to.
138		139
139	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	140	=item cf::wait_for_tick, cf::wait_for_tick_begin
140		141
141	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	142	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	143	returns directly I<after> the tick processing (and consequently, can only wake one process
143	processing has been done. Call C<< ->wait >> on them to maximise the	144	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144	window of cpu time available, or simply to synchronise to the server tick.
145		145
146	=back	146	=back
147		147
148	=cut	148	=cut
149		149
150	BEGIN {	150	BEGIN {
151	*CORE::GLOBAL::warn = sub {	151	*CORE::GLOBAL::warn = sub {
152	my $msg = join "", @_;	152	my $msg = join "", @_;
153	utf8::encode $msg;
154		153
155	$msg .= "\n"	154	$msg .= "\n"
156	unless $msg =~ /\n$/;	155	unless $msg =~ /\n$/;
157		156
		157	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		158
		159	utf8::encode $msg;
158	LOG llevError, $msg;	160	LOG llevError, $msg;
159	};	161	};
160	}	162	}
161		163
162	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	164	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
963	}	965	}
964		966
965	sub path($) {	967	sub path($) {
966	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	968	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967		969
968	(playerdir $login) . "/$login.pl"	970	(playerdir $login) . "/playerdata"
969	}	971	}
970		972
971	sub find_active($) {	973	sub find_active($) {
972	$cf::PLAYER{$_[0]}	974	$cf::PLAYER{$_[0]}
973	and $cf::PLAYER{$_[0]}->active	975	and $cf::PLAYER{$_[0]}->active
…		…
986	my $login = $_[0];	988	my $login = $_[0];
987		989
988	my $guard = cf::lock_acquire "user_find:$login";	990	my $guard = cf::lock_acquire "user_find:$login";
989		991
990	$cf::PLAYER{$_[0]} \|\| do {	992	$cf::PLAYER{$_[0]} \|\| do {
		993	# rename old playerfiles to new ones
		994	#TODO: remove when no longer required
		995	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		996	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		997	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		998	aio_unlink +(playerdir $login) . "/$login.pl";
		999
991	my $pl = load_pl path $login	1000	my $pl = load_pl path $login
992	or return;	1001	or return;
993	$cf::PLAYER{$login} = $pl	1002	$cf::PLAYER{$login} = $pl
994	}	1003	}
995	}	1004	}
…		…
1124	}	1133	}
1125		1134
1126	\@paths	1135	\@paths
1127	}	1136	}
1128		1137
1129	=item $player->ext_reply ($msgid, $msgtype, %msg)	1138	=item $player->ext_reply ($msgid, %msg)
1130		1139
1131	Sends an ext reply to the player.	1140	Sends an ext reply to the player.
1132		1141
1133	=cut	1142	=cut
1134		1143
1135	sub ext_reply($$$%) {	1144	sub ext_reply($$%) {
1136	my ($self, $id, %msg) = @_;	1145	my ($self, $id, %msg) = @_;
1137		1146
1138	$msg{msgid} = $id;	1147	$msg{msgid} = $id;
1139		1148
1140	$self->send ("ext " . cf::to_json \%msg);	1149	$self->send ("ext " . cf::to_json \%msg);
1141	}	1150	}
1142		1151
1143	package cf;	1152	=item $player->ext_event ($type, %msg)
		1153
		1154	Sends an ext event to the client.
		1155
		1156	=cut
		1157
		1158	sub ext_event($$%) {
		1159	my ($self, $type, %msg) = @_;
		1160
		1161	$self->ns->ext_event ($type, %msg);
		1162	}
		1163
		1164	=head3 cf::region
		1165
		1166	=over 4
		1167
		1168	=cut
		1169
		1170	package cf::region;
		1171
		1172	=item cf::region::find_by_path $path
		1173
		1174	Tries to decuce the probable region for a map knowing only its path.
		1175
		1176	=cut
		1177
		1178	sub find_by_path($) {
		1179	my ($path) = @_;
		1180
		1181	my ($match, $specificity);
		1182
		1183	for my $region (list) {
		1184	if ($region->match && $path =~ $region->match) {
		1185	($match, $specificity) = ($region, $region->specificity)
		1186	if $region->specificity > $specificity;
		1187	}
		1188	}
		1189
		1190	$match
		1191	}
1144		1192
1145	=back	1193	=back
1146
1147		1194
1148	=head3 cf::map	1195	=head3 cf::map
1149		1196
1150	=over 4	1197	=over 4
1151		1198
…		…
1382	$self->load_header_orig	1429	$self->load_header_orig
1383	or return;	1430	or return;
1384	$self->prepare_orig;	1431	$self->prepare_orig;
1385	}	1432	}
1386		1433
		1434	$self->default_region (cf::region::find_by_path $self->{path})
		1435	unless $self->default_region;
		1436
1387	1	1437	1
1388	}	1438	}
1389		1439
1390	sub find;	1440	sub find;
1391	sub find {	1441	sub find {
…		…
1433	$self->in_memory (cf::MAP_LOADING);	1483	$self->in_memory (cf::MAP_LOADING);
1434		1484
1435	$self->alloc;	1485	$self->alloc;
1436		1486
1437	$self->pre_load;	1487	$self->pre_load;
		1488	Coro::cede;
1438		1489
1439	$self->_load_objects ($self->{load_path}, 1)	1490	$self->_load_objects ($self->{load_path}, 1)
1440	or return;	1491	or return;
1441		1492
1442	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1493	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
…		…
1449	$self->_load_objects ($uniq, 0);	1500	$self->_load_objects ($uniq, 0);
1450	}	1501	}
1451	}	1502	}
1452		1503
1453	Coro::cede;	1504	Coro::cede;
1454
1455	# now do the right thing for maps	1505	# now do the right thing for maps
1456	$self->link_multipart_objects;	1506	$self->link_multipart_objects;
		1507	Coro::cede;
1457		1508
1458	unless ($self->{deny_activate}) {	1509	unless ($self->{deny_activate}) {
1459	$self->decay_objects;	1510	$self->decay_objects;
1460	$self->fix_auto_apply;	1511	$self->fix_auto_apply;
1461	$self->update_buttons;	1512	$self->update_buttons;
…		…
1463	$self->set_darkness_map;	1514	$self->set_darkness_map;
1464	$self->difficulty ($self->estimate_difficulty)	1515	$self->difficulty ($self->estimate_difficulty)
1465	unless $self->difficulty;	1516	unless $self->difficulty;
1466	Coro::cede;	1517	Coro::cede;
1467	$self->activate;	1518	$self->activate;
		1519	Coro::cede;
1468	}	1520	}
1469		1521
1470	$self->post_load;	1522	$self->post_load;
		1523	Coro::cede;
1471		1524
1472	$self->in_memory (cf::MAP_IN_MEMORY);	1525	$self->in_memory (cf::MAP_IN_MEMORY);
1473	}	1526	}
1474		1527
1475	sub customise_for {	1528	sub customise_for {
…		…
1953		2006
1954	return unless $self->type == cf::PLAYER;	2007	return unless $self->type == cf::PLAYER;
1955		2008
1956	if ($exit->slaying eq "/!") {	2009	if ($exit->slaying eq "/!") {
1957	#TODO: this should de-fi-ni-te-ly not be a sync-job	2010	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2011	# the problem is that $exit might not survive long enough
		2012	# so it needs to be done right now, right here
1958	cf::sync_job { prepare_random_map $exit };	2013	cf::sync_job { prepare_random_map $exit };
1959	}	2014	}
1960		2015
1961	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2016	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962	my $hp = $exit->stats->hp;	2017	my $hp = $exit->stats->hp;
…		…
1970	$self->goto ($slaying, $hp, $sp);	2025	$self->goto ($slaying, $hp, $sp);
1971		2026
1972	1;	2027	1;
1973	}) {	2028	}) {
1974	$self->message ("Something went wrong deep within the crossfire server. "	2029	$self->message ("Something went wrong deep within the crossfire server. "
1975	. "I'll try to bring you back to the map you were before. "	2030	. "I'll try to bring you back to the map you were before. "
1976	. "Please report this to the dungeon master!",	2031	. "Please report this to the dungeon master!",
1977	cf::NDI_UNIQUE \| cf::NDI_RED);	2032	cf::NDI_UNIQUE \| cf::NDI_RED);
1978		2033
1979	warn "ERROR in enter_exit: $@";	2034	warn "ERROR in enter_exit: $@";
1980	$self->leave_link;	2035	$self->leave_link;
1981	}	2036	}
1982	})->prio (1);	2037	})->prio (1);
…		…
1998		2053
1999	utf8::encode $text;	2054	utf8::encode $text;
2000	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2055	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2001	}	2056	}
2002		2057
		2058	=item $client->ext_event ($type, %msg)
		2059
		2060	Sends an exti event to the client.
		2061
		2062	=cut
		2063
		2064	sub cf::client::ext_event($$%) {
		2065	my ($self, $type, %msg) = @_;
		2066
		2067	$msg{msgtype} = "event_$type";
		2068	$self->send_packet ("ext " . cf::to_json \%msg);
		2069	}
2003		2070
2004	=item $success = $client->query ($flags, "text", \&cb)	2071	=item $success = $client->query ($flags, "text", \&cb)
2005		2072
2006	Queues a query to the client, calling the given callback with	2073	Queues a query to the client, calling the given callback with
2007	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2074	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2199	#############################################################################	2266	#############################################################################
2200		2267
2201	=head2 EXTENSION DATABASE SUPPORT	2268	=head2 EXTENSION DATABASE SUPPORT
2202		2269
2203	Crossfire maintains a very simple database for extension use. It can	2270	Crossfire maintains a very simple database for extension use. It can
2204	currently store anything that can be serialised using Storable, which	2271	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2205	excludes objects.	2272	convert to/from binary).
2206		2273
2207	The parameter C<$family> should best start with the name of the extension	2274	The parameter C<$family> should best start with the name of the extension
2208	using it, it should be unique.	2275	using it, it should be unique.
2209		2276
2210	=over 4	2277	=over 4
…		…
2233	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2300	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2234	cf::cleanup "db_open(db): $!" if $!;	2301	cf::cleanup "db_open(db): $!" if $!;
2235	};	2302	};
2236	cf::cleanup "db_open(db): $@" if $@;	2303	cf::cleanup "db_open(db): $@" if $@;
2237	};	2304	};
2238
2239	my $path = cf::localdir . "/database.pst";
2240	if (stat $path) {
2241	cf::sync_job {
2242	my $pst = Storable::retrieve $path;
2243
2244	cf::db_put (board => data => $pst->{board});
2245	cf::db_put (guildrules => data => $pst->{guildrules});
2246	cf::db_put (rent => balance => $pst->{rent}{balance});
2247	BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249	unlink $path;
2250	};
2251	}
2252	}	2305	}
2253	}	2306	}
2254		2307
2255	sub db_get($$) {	2308	sub db_get($$) {
2256	my $key = "$_[0]/$_[1]";	2309	my $key = "$_[0]/$_[1]";
2257		2310
2258	cf::sync_job {	2311	cf::sync_job {
2259	BDB::db_get $DB, undef, $key, my $data;	2312	BDB::db_get $DB, undef, $key, my $data;
2260		2313
2261	$! ? ()	2314	$! ? ()
2262	: Compress::LZF::sthaw $data	2315	: $data
2263	}	2316	}
2264	}	2317	}
2265		2318
2266	sub db_put($$$) {	2319	sub db_put($$$) {
2267	BDB::dbreq_pri 4;	2320	BDB::dbreq_pri 4;
2268	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2321	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2269	}	2322	}
		2323
		2324	=item cf::cache $id => [$paths...], $processversion => $process
		2325
		2326	Generic caching function that returns the value of the resource $id,
		2327	caching and regenerating as required.
		2328
		2329	This function can block.
		2330
		2331	=cut
		2332
		2333	sub cache {
		2334	my ($id, $src, $processversion, $process) = @_;
		2335
		2336	my $meta =
		2337	join "\x00",
		2338	$processversion,
		2339	map {
		2340	aio_stat $_
		2341	and Carp::croak "$_: $!";
		2342
		2343	($_, (stat _)[7,9])
		2344	} @$src;
		2345
		2346	my $dbmeta = db_get cache => "$id/meta";
		2347	if ($dbmeta ne $meta) {
		2348	# changed, we may need to process
		2349
		2350	my @data;
		2351	my $md5;
		2352
		2353	for (0 .. $#$src) {
		2354	0 <= aio_load $src->[$_], $data[$_]
		2355	or Carp::croak "$src->[$_]: $!";
		2356	}
		2357
		2358	# if processing is expensive, check
		2359	# checksum first
		2360	if (1) {
		2361	$md5 =
		2362	join "\x00",
		2363	$processversion,
		2364	map {
		2365	Coro::cede;
		2366	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2367	} 0.. $#$src;
		2368
		2369
		2370	my $dbmd5 = db_get cache => "$id/md5";
		2371	if ($dbmd5 eq $md5) {
		2372	db_put cache => "$id/meta", $meta;
		2373
		2374	return db_get cache => "$id/data";
		2375	}
		2376	}
		2377
		2378	my $data = $process->(\@data);
		2379
		2380	db_put cache => "$id/data", $data;
		2381	db_put cache => "$id/md5" , $md5;
		2382	db_put cache => "$id/meta", $meta;
		2383
		2384	return $data;
		2385	}
		2386
		2387	db_get cache => "$id/data"
		2388	}
		2389
		2390	=item fork_call { }, $args
		2391
		2392	Executes the given code block with the given arguments in a seperate
		2393	process, returning the results. Everything must be serialisable with
		2394	Coro::Storable. May, of course, block. Note that the executed sub may
		2395	never block itself or use any form of Event handling.
		2396
		2397	=cut
		2398
		2399	sub fork_call(&@) {
		2400	my ($cb, @args) = @_;
		2401
		2402	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2403	# or die "socketpair: $!";
		2404	pipe my $fh1, my $fh2
		2405	or die "pipe: $!";
		2406
		2407	if (my $pid = fork) {
		2408	close $fh2;
		2409
		2410	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2411	$res = Coro::Storable::thaw $res;
		2412
		2413	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2414
		2415	die $$res unless "ARRAY" eq ref $res;
		2416
		2417	return wantarray ? @$res : $res->[-1];
		2418	} else {
		2419	local $SIG{__WARN__};
		2420	eval {
		2421	local $SIG{__DIE__};
		2422	close $fh1;
		2423
		2424	my @res = eval { $cb->(@args) };
		2425	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2426	};
		2427
		2428	warn $@ if $@;
		2429	_exit 0;
		2430	}
		2431	}
		2432
		2433
2270		2434
2271	#############################################################################	2435	#############################################################################
2272	# the server's init and main functions	2436	# the server's init and main functions
2273		2437
2274	sub load_facedata {	2438	sub load_facedata($) {
2275	my $path = sprintf "%s/facedata", cf::datadir;	2439	my ($path) = @_;
2276		2440
2277	warn "loading facedata from $path\n";	2441	warn "loading facedata from $path\n";
2278		2442
2279	my $faces;	2443	my $facedata;
2280	0 < aio_load $path, $faces	2444	0 < aio_load $path, $facedata
2281	or die "$path: $!";	2445	or die "$path: $!";
2282		2446
2283	Coro::cede;
2284	$faces = Storable::thaw $faces;	2447	$facedata = Coro::Storable::thaw $facedata;
2285	Coro::cede;
2286		2448
2287	my $meta = delete $faces->{""};
2288	$meta->{version} == 1	2449	$facedata->{version} == 2
2289	or cf::cleanup "$path: version mismatch, cannot proceed.";	2450	or cf::cleanup "$path: version mismatch, cannot proceed.";
2290		2451
		2452	{
		2453	my $faces = $facedata->{faceinfo};
		2454
2291	while (my ($face, $info) = each %$faces) {	2455	while (my ($face, $info) = each %$faces) {
2292	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2456	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2293	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2457	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2458	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};	2459	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2296	Coro::cede;	2460	Coro::cede;
2297	}	2461	}
2298		2462
2299	while (my ($face, $info) = each %$faces) {	2463	while (my ($face, $info) = each %$faces) {
2300	next unless $info->{smooth};	2464	next unless $info->{smooth};
2301	my $idx = cf::face::find $face	2465	my $idx = cf::face::find $face
2302	or next;	2466	or next;
2303	if (my $smooth = cf::face::find $info->{smooth}) {	2467	if (my $smooth = cf::face::find $info->{smooth}) {
2304	cf::face::set_smooth $idx, $smooth;	2468	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2305	} else {	2469	} else {
2306	warn "smooth face '$info->{smooth}' not found for face '$face'";	2470	warn "smooth face '$info->{smooth}' not found for face '$face'";
2307	}	2471	}
2308	Coro::cede;	2472	Coro::cede;
		2473	}
		2474	}
		2475
		2476	{
		2477	my $anims = $facedata->{animinfo};
		2478
		2479	while (my ($anim, $info) = each %$anims) {
		2480	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2481	Coro::cede;
		2482	}
		2483
		2484	cf::anim::invalidate_all; # d'oh
2309	}	2485	}
2310		2486
2311	1	2487	1
2312	}	2488	}
2313		2489
		2490	sub reload_facedata {
		2491	load_facedata sprintf "%s/facedata", cf::datadir
		2492	or die "unable to load facedata\n";
		2493	}
		2494
		2495	sub reload_regions {
		2496	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
		2497	or die "unable to load regions file\n";
		2498	}
		2499
		2500	sub reload_archetypes {
		2501	load_resource_file sprintf "%s/archetypes", cf::datadir
		2502	or die "unable to load archetypes\n";
		2503	}
		2504
		2505	sub reload_treasures {
		2506	load_resource_file sprintf "%s/treasures", cf::datadir
		2507	or die "unable to load treasurelists\n";
		2508	}
		2509
2314	sub reload_resources {	2510	sub reload_resources {
2315	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2511	warn "reloading resource files...\n";
2316	or die "unable to load regions file\n";#d#	2512
		2513	reload_regions;
2317	load_facedata	2514	reload_facedata;
2318	or die "unable to load facedata\n";#d#	2515	reload_archetypes;
		2516	reload_treasures;
		2517
		2518	warn "finished reloading resource files\n";
2319	}	2519	}
2320		2520
2321	sub init {	2521	sub init {
2322	reload_resources;	2522	reload_resources;
2323	}	2523	}
…		…
2416		2616
2417	warn Carp::longmess "post_cleanup backtrace"	2617	warn Carp::longmess "post_cleanup backtrace"
2418	if $make_core;	2618	if $make_core;
2419	}	2619	}
2420		2620
2421	sub reload() {	2621	sub do_reload_perl() {
2422	# can/must only be called in main	2622	# can/must only be called in main
2423	if ($Coro::current != $Coro::main) {	2623	if ($Coro::current != $Coro::main) {
2424	warn "can only reload from main coroutine";	2624	warn "can only reload from main coroutine";
2425	return;	2625	return;
2426	}	2626	}
…		…
2525	warn "reattaching attachments to maps";	2725	warn "reattaching attachments to maps";
2526	reattach $_ for values %MAP;	2726	reattach $_ for values %MAP;
2527	warn "reattaching attachments to players";	2727	warn "reattaching attachments to players";
2528	reattach $_ for values %PLAYER;	2728	reattach $_ for values %PLAYER;
2529		2729
2530	warn "loading reloadable resources";
2531	reload_resources;
2532
2533	warn "leaving sync_job";	2730	warn "leaving sync_job";
2534		2731
2535	1	2732	1
2536	} or do {	2733	} or do {
2537	warn $@;	2734	warn $@;
…		…
2542	warn "reloaded";	2739	warn "reloaded";
2543	};	2740	};
2544		2741
2545	our $RELOAD_WATCHER; # used only during reload	2742	our $RELOAD_WATCHER; # used only during reload
2546		2743
		2744	sub reload_perl() {
		2745	# doing reload synchronously and two reloads happen back-to-back,
		2746	# coro crashes during coro_state_free->destroy here.
		2747
		2748	$RELOAD_WATCHER \|\|= Event->timer (
		2749	reentrant => 0,
		2750	after => 0,
		2751	data => WF_AUTOCANCEL,
		2752	cb => sub {
		2753	do_reload_perl;
		2754	undef $RELOAD_WATCHER;
		2755	},
		2756	);
		2757	}
		2758
2547	register_command "reload" => sub {	2759	register_command "reload" => sub {
2548	my ($who, $arg) = @_;	2760	my ($who, $arg) = @_;
2549		2761
2550	if ($who->flag (FLAG_WIZ)) {	2762	if ($who->flag (FLAG_WIZ)) {
2551	$who->message ("reloading server.");	2763	$who->message ("reloading server.");
2552		2764	async { reload_perl };
2553	# doing reload synchronously and two reloads happen back-to-back,
2554	# coro crashes during coro_state_free->destroy here.
2555
2556	$RELOAD_WATCHER \|\|= Event->timer (
2557	reentrant => 0,
2558	after => 0,
2559	data => WF_AUTOCANCEL,
2560	cb => sub {
2561	reload;
2562	undef $RELOAD_WATCHER;
2563	},
2564	);
2565	}	2765	}
2566	};	2766	};
2567		2767
2568	unshift @INC, $LIBDIR;	2768	unshift @INC, $LIBDIR;
2569		2769
2570	my $bug_warning = 0;	2770	my $bug_warning = 0;
		2771
		2772	our @WAIT_FOR_TICK;
		2773	our @WAIT_FOR_TICK_BEGIN;
		2774
		2775	sub wait_for_tick {
		2776	return unless $TICK_WATCHER->is_active;
		2777	return if $Coro::current == $Coro::main;
		2778
		2779	my $signal = new Coro::Signal;
		2780	push @WAIT_FOR_TICK, $signal;
		2781	$signal->wait;
		2782	}
		2783
		2784	sub wait_for_tick_begin {
		2785	return unless $TICK_WATCHER->is_active;
		2786	return if $Coro::current == $Coro::main;
		2787
		2788	my $signal = new Coro::Signal;
		2789	push @WAIT_FOR_TICK_BEGIN, $signal;
		2790	$signal->wait;
		2791	}
2571		2792
2572	$TICK_WATCHER = Event->timer (	2793	$TICK_WATCHER = Event->timer (
2573	reentrant => 0,	2794	reentrant => 0,
2574	parked => 1,	2795	parked => 1,
2575	prio => 0,	2796	prio => 0,
…		…
2583	}	2804	}
2584		2805
2585	$NOW = Event::time;	2806	$NOW = Event::time;
2586		2807
2587	cf::server_tick; # one server iteration	2808	cf::server_tick; # one server iteration
		2809
2588	$RUNTIME += $TICK;	2810	$RUNTIME += $TICK;
2589	$NEXT_TICK += $TICK;	2811	$NEXT_TICK += $TICK;
2590		2812
2591	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2813	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2592	$NEXT_RUNTIME_WRITE = $NOW + 10;	2814	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2594	write_runtime	2816	write_runtime
2595	or warn "ERROR: unable to write runtime file: $!";	2817	or warn "ERROR: unable to write runtime file: $!";
2596	};	2818	};
2597	}	2819	}
2598		2820
2599	$WAIT_FOR_TICK->broadcast;
2600	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2601
2602	# my $AFTER = Event::time;	2821	# my $AFTER = Event::time;
2603	# warn $AFTER - $NOW;#d#	2822	# warn $AFTER - $NOW;#d#
2604		2823
2605	# if we are delayed by four ticks or more, skip them all	2824	# if we are delayed by four ticks or more, skip them all
2606	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2825	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2607		2826
2608	$TICK_WATCHER->at ($NEXT_TICK);	2827	$TICK_WATCHER->at ($NEXT_TICK);
2609	$TICK_WATCHER->start;	2828	$TICK_WATCHER->start;
		2829
		2830	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2831	$sig->send;
		2832	}
		2833	while (my $sig = shift @WAIT_FOR_TICK) {
		2834	$sig->send;
		2835	}
		2836
		2837	_post_tick;
2610	},	2838	},
2611	);	2839	);
2612		2840
2613	{	2841	{
2614	BDB::max_poll_time $TICK * 0.1;	2842	BDB::max_poll_time $TICK * 0.1;
…		…
2673	prio => 6,	2901	prio => 6,
2674	cb => \&IO::AIO::poll_cb,	2902	cb => \&IO::AIO::poll_cb,
2675	);	2903	);
2676	}	2904	}
2677		2905
		2906	# load additional modules
		2907	use cf::pod;
		2908
2678	END { cf::emergency_save }	2909	END { cf::emergency_save }
2679		2910
2680	1	2911	1
2681		2912

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.230 by root, Mon Apr 2 18:04:46 2007 UTC vs. Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.230 by root, Mon Apr 2 18:04:46 2007 UTC vs.
Revision 1.251 by root, Wed Apr 18 14:45:13 2007 UTC