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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 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;
		10	use Event;
9	use Opcode;	11	use Opcode;
10	use Safe;	12	use Safe;
11	use Safe::Hole;	13	use Safe::Hole;
12		14
13	use Coro 3.5 ();	15	use Coro 3.61 ();
		16	use Coro::State;
		17	use Coro::Handle;
14	use Coro::Event;	18	use Coro::Event;
15	use Coro::Timer;	19	use Coro::Timer;
16	use Coro::Signal;	20	use Coro::Signal;
17	use Coro::Semaphore;	21	use Coro::Semaphore;
18	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
19		24
20	use BDB ();	25	use BDB ();
21	use Data::Dumper;	26	use Data::Dumper;
22	use Digest::MD5;	27	use Digest::MD5;
23	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
24	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
25	use YAML::Syck ();
26	use Time::HiRes;	31	use Time::HiRes;
27	use Compress::LZF;	32	use Compress::LZF;
28		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
		37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29	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
30		39
31	use Event; $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
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		41
35	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	42	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
37		44
38	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	45	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		46
		47	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39		48
40	our %COMMAND = ();	49	our %COMMAND = ();
41	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
42		51
43	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
44	our %EXTCMD = ();	53	our %EXTCMD = ();
45	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
46	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
47		56
		57	our $RELOAD; # number of reloads so far
48	our @EVENT;	58	our @EVENT;
49	our $LIBDIR = datadir . "/ext";
50		59
51	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52	our $TICK_WATCHER;	73	our $TICK_WATCHER;
53	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
54	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55	our $NEXT_TICK;	76	our $NEXT_TICK;
56	our $NOW;	77	our $NOW;
…		…
65	our $RUNTIME;	86	our $RUNTIME;
66		87
67	our %PLAYER; # all users	88	our %PLAYER; # all users
68	our %MAP; # all maps	89	our %MAP; # all maps
69	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
70	our $RANDOM_MAPS = cf::localdir . "/random";
71	our $BDB_ENV_DIR = cf::localdir . "/db";
72
73	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
74	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
75		91
76	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
77	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78		94
79	binmode STDOUT;	95	binmode STDOUT;
80	binmode STDERR;	96	binmode STDERR;
81		97
82	# read virtual server time, if available	98	# read virtual server time, if available
83	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
84	open my $fh, "<", cf::localdir . "/runtime"	100	open my $fh, "<", "$LOCALDIR/runtime"
85	or die "unable to read runtime file: $!";	101	or die "unable to read runtime file: $!";
86	$RUNTIME = <$fh> + 0.;	102	$RUNTIME = <$fh> + 0.;
87	}	103	}
88		104
89	mkdir cf::localdir;	105	mkdir $_
90	mkdir cf::localdir . "/" . cf::playerdir;	106	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91	mkdir cf::localdir . "/" . cf::tmpdir;
92	mkdir cf::localdir . "/" . cf::uniquedir;
93	mkdir $RANDOM_MAPS;
94	mkdir $BDB_ENV_DIR;
95		107
96	our $EMERGENCY_POSITION;	108	our $EMERGENCY_POSITION;
97		109
98	sub cf::map::normalise;	110	sub cf::map::normalise;
99		111
…		…
110	=item $cf::RUNTIME	122	=item $cf::RUNTIME
111		123
112	The time this server has run, starts at 0 and is increased by $cf::TICK on	124	The time this server has run, starts at 0 and is increased by $cf::TICK on
113	every server tick.	125	every server tick.
114		126
115	=item $cf::LIBDIR	127	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		128	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		129	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116		130
117	The perl library directory, where extensions and cf-specific modules can	131	Various directories - "/etc", read-only install directory, perl-library
118	be found. It will be added to C<@INC> automatically.	132	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		133	unique-items directory, player file directory, random maps directory and
		134	database environment.
119		135
120	=item $cf::NOW	136	=item $cf::NOW
121		137
122	The time of the last (current) server tick.	138	The time of the last (current) server tick.
123		139
…		…
128	=item %cf::CFG	144	=item %cf::CFG
129		145
130	Configuration for the server, loaded from C</etc/crossfire/config>, or	146	Configuration for the server, loaded from C</etc/crossfire/config>, or
131	from wherever your confdir points to.	147	from wherever your confdir points to.
132		148
133	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	149	=item cf::wait_for_tick, cf::wait_for_tick_begin
134		150
135	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	151	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	152	returns directly I<after> the tick processing (and consequently, can only wake one process
137	processing has been done. Call C<< ->wait >> on them to maximise the	153	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138	window of cpu time available, or simply to synchronise to the server tick.
139		154
140	=back	155	=back
141		156
142	=cut	157	=cut
143		158
144	BEGIN {	159	BEGIN {
145	*CORE::GLOBAL::warn = sub {	160	*CORE::GLOBAL::warn = sub {
146	my $msg = join "", @_;	161	my $msg = join "", @_;
147	utf8::encode $msg;
148		162
149	$msg .= "\n"	163	$msg .= "\n"
150	unless $msg =~ /\n$/;	164	unless $msg =~ /\n$/;
151		165
		166	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		167
		168	utf8::encode $msg;
152	LOG llevError, $msg;	169	LOG llevError, $msg;
153	};	170	};
154	}	171	}
155		172
156	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
202	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	219	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203	$d	220	$d
204	} \|\| "[unable to dump $_[0]: '$@']";	221	} \|\| "[unable to dump $_[0]: '$@']";
205	}	222	}
206		223
207	use JSON::Syck (); # TODO# replace by JSON::PC once working	224	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208		225
209	=item $ref = cf::from_json $json	226	=item $ref = cf::from_json $json
210		227
211	Converts a JSON string into the corresponding perl data structure.	228	Converts a JSON string into the corresponding perl data structure.
212		229
213	=cut
214
215	sub from_json($) {
216	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217	JSON::Syck::Load $_[0]
218	}
219
220	=item $json = cf::to_json $ref	230	=item $json = cf::to_json $ref
221		231
222	Converts a perl data structure into its JSON representation.	232	Converts a perl data structure into its JSON representation.
223
224	=cut
225
226	sub to_json($) {
227	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228	JSON::Syck::Dump $_[0]
229	}
230		233
231	=item cf::lock_wait $string	234	=item cf::lock_wait $string
232		235
233	Wait until the given lock is available. See cf::lock_acquire.	236	Wait until the given lock is available. See cf::lock_acquire.
234		237
…		…
240	returned.	243	returned.
241		244
242	Lock names should begin with a unique identifier (for example, cf::map::find	245	Lock names should begin with a unique identifier (for example, cf::map::find
243	uses map_find and cf::map::load uses map_load).	246	uses map_find and cf::map::load uses map_load).
244		247
		248	=item $locked = cf::lock_active $string
		249
		250	Return true if the lock is currently active, i.e. somebody has locked it.
		251
245	=cut	252	=cut
246		253
247	our %LOCK;	254	our %LOCK;
248		255
249	sub lock_wait($) {	256	sub lock_wait($) {
…		…
266		273
267	Coro::guard {	274	Coro::guard {
268	# wake up all waiters, to be on the safe side	275	# wake up all waiters, to be on the safe side
269	$_->ready for @{ delete $LOCK{$key} };	276	$_->ready for @{ delete $LOCK{$key} };
270	}	277	}
		278	}
		279
		280	sub lock_active($) {
		281	my ($key) = @_;
		282
		283	! ! $LOCK{$key}
271	}	284	}
272		285
273	sub freeze_mainloop {	286	sub freeze_mainloop {
274	return unless $TICK_WATCHER->is_active;	287	return unless $TICK_WATCHER->is_active;
275		288
…		…
356	}	369	}
357		370
358	sub write_runtime {	371	sub write_runtime {
359	my $guard = cf::lock_acquire "write_runtime";	372	my $guard = cf::lock_acquire "write_runtime";
360		373
361	my $runtime = cf::localdir . "/runtime";	374	my $runtime = "$LOCALDIR/runtime";
362		375
363	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	376	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
364	or return;	377	or return;
365		378
366	my $value = $cf::RUNTIME + 90 + 10;	379	my $value = $cf::RUNTIME + 90 + 10;
…		…
379		392
380	aio_rename "$runtime~", $runtime	393	aio_rename "$runtime~", $runtime
381	and return;	394	and return;
382		395
383	1	396	1
		397	}
		398
		399	=item cf::datalog type => key => value, ...
		400
		401	Log a datalog packet of the given type with the given key-value pairs.
		402
		403	=cut
		404
		405	sub datalog($@) {
		406	my ($type, %kv) = @_;
		407	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384	}	408	}
385		409
386	=back	410	=back
387		411
388	=cut	412	=cut
…		…
950	Returns the given player object, loading it if necessary (might block).	974	Returns the given player object, loading it if necessary (might block).
951		975
952	=cut	976	=cut
953		977
954	sub playerdir($) {	978	sub playerdir($) {
955	cf::localdir	979	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	980	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	981	}
961		982
962	sub path($) {	983	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	984	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		985
965	(playerdir $login) . "/$login.pl"	986	(playerdir $login) . "/playerdata"
966	}	987	}
967		988
968	sub find_active($) {	989	sub find_active($) {
969	$cf::PLAYER{$_[0]}	990	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	991	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1004	my $login = $_[0];
984		1005
985	my $guard = cf::lock_acquire "user_find:$login";	1006	my $guard = cf::lock_acquire "user_find:$login";
986		1007
987	$cf::PLAYER{$_[0]} \|\| do {	1008	$cf::PLAYER{$_[0]} \|\| do {
		1009	# rename old playerfiles to new ones
		1010	#TODO: remove when no longer required
		1011	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1012	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1013	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1014	aio_unlink +(playerdir $login) . "/$login.pl";
		1015
988	my $pl = load_pl path $login	1016	my $pl = load_pl path $login
989	or return;	1017	or return;
990	$cf::PLAYER{$login} = $pl	1018	$cf::PLAYER{$login} = $pl
991	}	1019	}
992	}	1020	}
…		…
1054	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;	1082	$cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055		1083
1056	IO::AIO::aio_rmtree $temp;	1084	IO::AIO::aio_rmtree $temp;
1057	}	1085	}
1058		1086
		1087	=item $pl->kick
		1088
		1089	Kicks a player out of the game. This destroys the connection.
		1090
		1091	=cut
		1092
		1093	sub kick {
		1094	my ($pl, $kicker) = @_;
		1095
		1096	$pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
		1097	$pl->killer ("kicked");
		1098	$pl->ns->destroy;
		1099	}
		1100
1059	=item cf::player::list_logins	1101	=item cf::player::list_logins
1060		1102
1061	Returns am arrayref of all valid playernames in the system, can take a	1103	Returns am arrayref of all valid playernames in the system, can take a
1062	while and may block, so not sync_job-capable, ever.	1104	while and may block, so not sync_job-capable, ever.
1063		1105
1064	=cut	1106	=cut
1065		1107
1066	sub list_logins {	1108	sub list_logins {
1067	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1109	my $dirs = aio_readdir $PLAYERDIR
1068	or return [];	1110	or return [];
1069		1111
1070	my @logins;	1112	my @logins;
1071		1113
1072	for my $login (@$dirs) {	1114	for my $login (@$dirs) {
…		…
1107	}	1149	}
1108		1150
1109	\@paths	1151	\@paths
1110	}	1152	}
1111		1153
1112	=item $player->ext_reply ($msgid, $msgtype, %msg)	1154	=item $player->ext_reply ($msgid, %msg)
1113		1155
1114	Sends an ext reply to the player.	1156	Sends an ext reply to the player.
1115		1157
1116	=cut	1158	=cut
1117		1159
1118	sub ext_reply($$$%) {	1160	sub ext_reply($$%) {
1119	my ($self, $id, %msg) = @_;	1161	my ($self, $id, %msg) = @_;
1120		1162
1121	$msg{msgid} = $id;	1163	$msg{msgid} = $id;
1122		1164
1123	$self->send ("ext " . cf::to_json \%msg);	1165	$self->send ("ext " . cf::to_json \%msg);
1124	}	1166	}
1125		1167
1126	package cf;	1168	=item $player->ext_event ($type, %msg)
		1169
		1170	Sends an ext event to the client.
		1171
		1172	=cut
		1173
		1174	sub ext_event($$%) {
		1175	my ($self, $type, %msg) = @_;
		1176
		1177	$self->ns->ext_event ($type, %msg);
		1178	}
		1179
		1180	=head3 cf::region
		1181
		1182	=over 4
		1183
		1184	=cut
		1185
		1186	package cf::region;
		1187
		1188	=item cf::region::find_by_path $path
		1189
		1190	Tries to decuce the probable region for a map knowing only its path.
		1191
		1192	=cut
		1193
		1194	sub find_by_path($) {
		1195	my ($path) = @_;
		1196
		1197	my ($match, $specificity);
		1198
		1199	for my $region (list) {
		1200	if ($region->match && $path =~ $region->match) {
		1201	($match, $specificity) = ($region, $region->specificity)
		1202	if $region->specificity > $specificity;
		1203	}
		1204	}
		1205
		1206	$match
		1207	}
1127		1208
1128	=back	1209	=back
1129
1130		1210
1131	=head3 cf::map	1211	=head3 cf::map
1132		1212
1133	=over 4	1213	=over 4
1134		1214
…		…
1272		1352
1273	# the original (read-only) location	1353	# the original (read-only) location
1274	sub load_path {	1354	sub load_path {
1275	my ($self) = @_;	1355	my ($self) = @_;
1276		1356
1277	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1357	"$MAPDIR/$self->{path}.map"
1278	}	1358	}
1279		1359
1280	# the temporary/swap location	1360	# the temporary/swap location
1281	sub save_path {	1361	sub save_path {
1282	my ($self) = @_;	1362	my ($self) = @_;
1283		1363
1284	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1364	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1365	"$TMPDIR/$path.map"
1286	}	1366	}
1287		1367
1288	# the unique path, undef == no special unique path	1368	# the unique path, undef == no special unique path
1289	sub uniq_path {	1369	sub uniq_path {
1290	my ($self) = @_;	1370	my ($self) = @_;
1291		1371
1292	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1372	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1293	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1373	"$UNIQUEDIR/$path"
1294	}	1374	}
1295		1375
1296	# and all this just because we cannot iterate over	1376	# and all this just because we cannot iterate over
1297	# all maps in C++...	1377	# all maps in C++...
1298	sub change_all_map_light {	1378	sub change_all_map_light {
…		…
1365	$self->load_header_orig	1445	$self->load_header_orig
1366	or return;	1446	or return;
1367	$self->prepare_orig;	1447	$self->prepare_orig;
1368	}	1448	}
1369		1449
		1450	$self->default_region (cf::region::find_by_path $self->{path})
		1451	unless $self->default_region;
		1452
1370	1	1453	1
1371	}	1454	}
1372		1455
1373	sub find;	1456	sub find;
1374	sub find {	1457	sub find {
…		…
1407	my ($self) = @_;	1490	my ($self) = @_;
1408		1491
1409	local $self->{deny_reset} = 1; # loading can take a long time	1492	local $self->{deny_reset} = 1; # loading can take a long time
1410		1493
1411	my $path = $self->{path};	1494	my $path = $self->{path};
		1495
		1496	{
1412	my $guard = cf::lock_acquire "map_load:$path";	1497	my $guard = cf::lock_acquire "map_load:$path";
1413		1498
1414	return if $self->in_memory != cf::MAP_SWAPPED;	1499	return if $self->in_memory != cf::MAP_SWAPPED;
1415		1500
1416	$self->in_memory (cf::MAP_LOADING);	1501	$self->in_memory (cf::MAP_LOADING);
1417		1502
1418	$self->alloc;	1503	$self->alloc;
1419		1504
1420	$self->pre_load;	1505	$self->pre_load;
1421
1422	$self->_load_objects ($self->{load_path}, 1)
1423	or return;
1424
1425	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1426	if delete $self->{load_original};
1427
1428	if (my $uniq = $self->uniq_path) {
1429	utf8::encode $uniq;
1430	if (aio_open $uniq, O_RDONLY, 0) {
1431	$self->clear_unique_items;
1432	$self->_load_objects ($uniq, 0);
1433	}
1434	}
1435
1436	Coro::cede;
1437
1438	# now do the right thing for maps
1439	$self->link_multipart_objects;
1440
1441	unless ($self->{deny_activate}) {
1442	$self->decay_objects;
1443	$self->fix_auto_apply;
1444	$self->update_buttons;
1445	Coro::cede;	1506	Coro::cede;
1446	$self->set_darkness_map;	1507
		1508	$self->_load_objects ($self->{load_path}, 1)
		1509	or return;
		1510
		1511	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1512	if delete $self->{load_original};
		1513
		1514	if (my $uniq = $self->uniq_path) {
		1515	utf8::encode $uniq;
		1516	if (aio_open $uniq, O_RDONLY, 0) {
		1517	$self->clear_unique_items;
		1518	$self->_load_objects ($uniq, 0);
		1519	}
		1520	}
		1521
		1522	Coro::cede;
		1523	# now do the right thing for maps
		1524	$self->link_multipart_objects;
1447	$self->difficulty ($self->estimate_difficulty)	1525	$self->difficulty ($self->estimate_difficulty)
1448	unless $self->difficulty;	1526	unless $self->difficulty;
1449	Coro::cede;	1527	Coro::cede;
		1528
		1529	unless ($self->{deny_activate}) {
		1530	$self->decay_objects;
		1531	$self->fix_auto_apply;
		1532	$self->update_buttons;
		1533	Coro::cede;
		1534	$self->set_darkness_map;
		1535	Coro::cede;
1450	$self->activate;	1536	$self->activate;
		1537	}
		1538
		1539	$self->in_memory (cf::MAP_IN_MEMORY);
1451	}	1540	}
1452		1541
1453	$self->post_load;	1542	$self->post_load;
1454
1455	$self->in_memory (cf::MAP_IN_MEMORY);
1456	}	1543	}
1457		1544
1458	sub customise_for {	1545	sub customise_for {
1459	my ($self, $ob) = @_;	1546	my ($self, $ob) = @_;
1460		1547
…		…
1651	instantiated unique items. May block.	1738	instantiated unique items. May block.
1652		1739
1653	=cut	1740	=cut
1654		1741
1655	sub unique_maps() {	1742	sub unique_maps() {
1656	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1743	my $files = aio_readdir $UNIQUEDIR
1657	or return;	1744	or return;
1658		1745
1659	my @paths;	1746	my @paths;
1660		1747
1661	for (@$files) {	1748	for (@$files) {
…		…
1774	$LINK_MAP	1861	$LINK_MAP
1775	}	1862	}
1776		1863
1777	sub cf::object::player::enter_link {	1864	sub cf::object::player::enter_link {
1778	my ($self) = @_;	1865	my ($self) = @_;
1779
1780	$self->deactivate_recursive;
1781		1866
1782	return if UNIVERSAL::isa $self->map, "ext::map_link";	1867	return if UNIVERSAL::isa $self->map, "ext::map_link";
1783		1868
1784	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]	1869	$self->{_link_pos} \|\|= [$self->map->{path}, $self->x, $self->y]
1785	if $self->map;	1870	if $self->map;
…		…
1917		2002
1918	$rmp->{random_seed} \|\|= $exit->random_seed;	2003	$rmp->{random_seed} \|\|= $exit->random_seed;
1919		2004
1920	my $data = cf::to_json $rmp;	2005	my $data = cf::to_json $rmp;
1921	my $md5 = Digest::MD5::md5_hex $data;	2006	my $md5 = Digest::MD5::md5_hex $data;
1922	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2007	my $meta = "$RANDOMDIR/$md5.meta";
1923		2008
1924	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2009	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1925	aio_write $fh, 0, (length $data), $data, 0;	2010	aio_write $fh, 0, (length $data), $data, 0;
1926	undef $fh;	2011	undef $fh;
1927	aio_rename "$meta~", $meta;	2012	aio_rename "$meta~", $meta;
…		…
1936		2021
1937	return unless $self->type == cf::PLAYER;	2022	return unless $self->type == cf::PLAYER;
1938		2023
1939	if ($exit->slaying eq "/!") {	2024	if ($exit->slaying eq "/!") {
1940	#TODO: this should de-fi-ni-te-ly not be a sync-job	2025	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2026	# the problem is that $exit might not survive long enough
		2027	# so it needs to be done right now, right here
1941	cf::sync_job { prepare_random_map $exit };	2028	cf::sync_job { prepare_random_map $exit };
1942	}	2029	}
1943		2030
1944	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2031	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1945	my $hp = $exit->stats->hp;	2032	my $hp = $exit->stats->hp;
…		…
1953	$self->goto ($slaying, $hp, $sp);	2040	$self->goto ($slaying, $hp, $sp);
1954		2041
1955	1;	2042	1;
1956	}) {	2043	}) {
1957	$self->message ("Something went wrong deep within the crossfire server. "	2044	$self->message ("Something went wrong deep within the crossfire server. "
1958	. "I'll try to bring you back to the map you were before. "	2045	. "I'll try to bring you back to the map you were before. "
1959	. "Please report this to the dungeon master!",	2046	. "Please report this to the dungeon master!",
1960	cf::NDI_UNIQUE \| cf::NDI_RED);	2047	cf::NDI_UNIQUE \| cf::NDI_RED);
1961		2048
1962	warn "ERROR in enter_exit: $@";	2049	warn "ERROR in enter_exit: $@";
1963	$self->leave_link;	2050	$self->leave_link;
1964	}	2051	}
1965	})->prio (1);	2052	})->prio (1);
…		…
1978		2065
1979	sub cf::client::send_drawinfo {	2066	sub cf::client::send_drawinfo {
1980	my ($self, $text, $flags) = @_;	2067	my ($self, $text, $flags) = @_;
1981		2068
1982	utf8::encode $text;	2069	utf8::encode $text;
1983	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2070	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
1984	}	2071	}
1985		2072
		2073	=item $client->ext_event ($type, %msg)
		2074
		2075	Sends an exti event to the client.
		2076
		2077	=cut
		2078
		2079	sub cf::client::ext_event($$%) {
		2080	my ($self, $type, %msg) = @_;
		2081
		2082	$msg{msgtype} = "event_$type";
		2083	$self->send_packet ("ext " . cf::to_json \%msg);
		2084	}
1986		2085
1987	=item $success = $client->query ($flags, "text", \&cb)	2086	=item $success = $client->query ($flags, "text", \&cb)
1988		2087
1989	Queues a query to the client, calling the given callback with	2088	Queues a query to the client, calling the given callback with
1990	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2089	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2087		2186
2088	# here we export the classes and methods available to script code	2187	# here we export the classes and methods available to script code
2089		2188
2090	=pod	2189	=pod
2091		2190
2092	The following fucntions and emthods are available within a safe environment:	2191	The following functions and methods are available within a safe environment:
2093		2192
2094	cf::object contr pay_amount pay_player map	2193	cf::object contr pay_amount pay_player map
2095	cf::object::player player	2194	cf::object::player player
2096	cf::player peaceful	2195	cf::player peaceful
2097	cf::map trigger	2196	cf::map trigger
…		…
2182	#############################################################################	2281	#############################################################################
2183		2282
2184	=head2 EXTENSION DATABASE SUPPORT	2283	=head2 EXTENSION DATABASE SUPPORT
2185		2284
2186	Crossfire maintains a very simple database for extension use. It can	2285	Crossfire maintains a very simple database for extension use. It can
2187	currently store anything that can be serialised using Storable, which	2286	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2188	excludes objects.	2287	convert to/from binary).
2189		2288
2190	The parameter C<$family> should best start with the name of the extension	2289	The parameter C<$family> should best start with the name of the extension
2191	using it, it should be unique.	2290	using it, it should be unique.
2192		2291
2193	=over 4	2292	=over 4
…		…
2216	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2315	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2217	cf::cleanup "db_open(db): $!" if $!;	2316	cf::cleanup "db_open(db): $!" if $!;
2218	};	2317	};
2219	cf::cleanup "db_open(db): $@" if $@;	2318	cf::cleanup "db_open(db): $@" if $@;
2220	};	2319	};
2221
2222	my $path = cf::localdir . "/database.pst";
2223	if (stat $path) {
2224	cf::sync_job {
2225	my $pst = Storable::retrieve $path;
2226
2227	cf::db_put (board => data => $pst->{board});
2228	cf::db_put (guildrules => data => $pst->{guildrules});
2229	cf::db_put (rent => balance => $pst->{rent}{balance});
2230	BDB::db_env_txn_checkpoint $DB_ENV;
2231
2232	unlink $path;
2233	};
2234	}
2235	}	2320	}
2236	}	2321	}
2237		2322
2238	sub db_get($$) {	2323	sub db_get($$) {
2239	my $key = "$_[0]/$_[1]";	2324	my $key = "$_[0]/$_[1]";
2240		2325
2241	cf::sync_job {	2326	cf::sync_job {
2242	BDB::db_get $DB, undef, $key, my $data;	2327	BDB::db_get $DB, undef, $key, my $data;
2243		2328
2244	$! ? ()	2329	$! ? ()
2245	: Compress::LZF::sthaw $data	2330	: $data
2246	}	2331	}
2247	}	2332	}
2248		2333
2249	sub db_put($$$) {	2334	sub db_put($$$) {
2250	BDB::dbreq_pri 4;	2335	BDB::dbreq_pri 4;
2251	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2336	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2252	}	2337	}
		2338
		2339	=item cf::cache $id => [$paths...], $processversion => $process
		2340
		2341	Generic caching function that returns the value of the resource $id,
		2342	caching and regenerating as required.
		2343
		2344	This function can block.
		2345
		2346	=cut
		2347
		2348	sub cache {
		2349	my ($id, $src, $processversion, $process) = @_;
		2350
		2351	my $meta =
		2352	join "\x00",
		2353	$processversion,
		2354	map {
		2355	aio_stat $_
		2356	and Carp::croak "$_: $!";
		2357
		2358	($_, (stat _)[7,9])
		2359	} @$src;
		2360
		2361	my $dbmeta = db_get cache => "$id/meta";
		2362	if ($dbmeta ne $meta) {
		2363	# changed, we may need to process
		2364
		2365	my @data;
		2366	my $md5;
		2367
		2368	for (0 .. $#$src) {
		2369	0 <= aio_load $src->[$_], $data[$_]
		2370	or Carp::croak "$src->[$_]: $!";
		2371	}
		2372
		2373	# if processing is expensive, check
		2374	# checksum first
		2375	if (1) {
		2376	$md5 =
		2377	join "\x00",
		2378	$processversion,
		2379	map {
		2380	Coro::cede;
		2381	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2382	} 0.. $#$src;
		2383
		2384
		2385	my $dbmd5 = db_get cache => "$id/md5";
		2386	if ($dbmd5 eq $md5) {
		2387	db_put cache => "$id/meta", $meta;
		2388
		2389	return db_get cache => "$id/data";
		2390	}
		2391	}
		2392
		2393	my $t1 = Time::HiRes::time;
		2394	my $data = $process->(\@data);
		2395	my $t2 = Time::HiRes::time;
		2396
		2397	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2398
		2399	db_put cache => "$id/data", $data;
		2400	db_put cache => "$id/md5" , $md5;
		2401	db_put cache => "$id/meta", $meta;
		2402
		2403	return $data;
		2404	}
		2405
		2406	db_get cache => "$id/data"
		2407	}
		2408
		2409	=item fork_call { }, $args
		2410
		2411	Executes the given code block with the given arguments in a seperate
		2412	process, returning the results. Everything must be serialisable with
		2413	Coro::Storable. May, of course, block. Note that the executed sub may
		2414	never block itself or use any form of Event handling.
		2415
		2416	=cut
		2417
		2418	sub fork_call(&@) {
		2419	my ($cb, @args) = @_;
		2420
		2421	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2422	# or die "socketpair: $!";
		2423	pipe my $fh1, my $fh2
		2424	or die "pipe: $!";
		2425
		2426	if (my $pid = fork) {
		2427	close $fh2;
		2428
		2429	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2430	$res = Coro::Storable::thaw $res;
		2431
		2432	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2433
		2434	die $$res unless "ARRAY" eq ref $res;
		2435
		2436	return wantarray ? @$res : $res->[-1];
		2437	} else {
		2438	local $SIG{__WARN__};
		2439	eval {
		2440	local $SIG{__DIE__};
		2441	close $fh1;
		2442
		2443	my @res = eval { $cb->(@args) };
		2444	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2445	};
		2446
		2447	warn $@ if $@;
		2448	_exit 0;
		2449	}
		2450	}
		2451
		2452
2253		2453
2254	#############################################################################	2454	#############################################################################
2255	# the server's init and main functions	2455	# the server's init and main functions
2256		2456
2257	sub init_resources {	2457	sub load_facedata($) {
2258	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2458	my ($path) = @_;
		2459
		2460	warn "loading facedata from $path\n";
		2461
		2462	my $facedata;
		2463	0 < aio_load $path, $facedata
		2464	or die "$path: $!";
		2465
		2466	$facedata = Coro::Storable::thaw $facedata;
		2467
		2468	$facedata->{version} == 2
		2469	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2470
		2471	{
		2472	my $faces = $facedata->{faceinfo};
		2473
		2474	while (my ($face, $info) = each %$faces) {
		2475	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
		2476	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2477	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2478	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2479	Coro::cede;
		2480	}
		2481
		2482	while (my ($face, $info) = each %$faces) {
		2483	next unless $info->{smooth};
		2484	my $idx = cf::face::find $face
		2485	or next;
		2486	if (my $smooth = cf::face::find $info->{smooth}) {
		2487	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2488	} else {
		2489	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2490	}
		2491	Coro::cede;
		2492	}
		2493	}
		2494
		2495	{
		2496	my $anims = $facedata->{animinfo};
		2497
		2498	while (my ($anim, $info) = each %$anims) {
		2499	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2500	Coro::cede;
		2501	}
		2502
		2503	cf::anim::invalidate_all; # d'oh
		2504	}
		2505
		2506	1
		2507	}
		2508
		2509	sub reload_regions {
		2510	load_resource_file "$MAPDIR/regions"
2259	or die "unable to load regions file\n";#d#	2511	or die "unable to load regions file\n";
		2512	}
		2513
		2514	sub reload_facedata {
		2515	load_facedata "$DATADIR/facedata"
		2516	or die "unable to load facedata\n";
		2517	}
		2518
		2519	sub reload_archetypes {
		2520	load_resource_file "$DATADIR/archetypes"
		2521	or die "unable to load archetypes\n";
		2522	}
		2523
		2524	sub reload_treasures {
		2525	load_resource_file "$DATADIR/treasures"
		2526	or die "unable to load treasurelists\n";
		2527	}
		2528
		2529	sub reload_resources {
		2530	warn "reloading resource files...\n";
		2531
		2532	reload_regions;
		2533	reload_facedata;
		2534	reload_archetypes;
		2535	reload_treasures;
		2536
		2537	warn "finished reloading resource files\n";
		2538	}
		2539
		2540	sub init {
		2541	reload_resources;
2260	}	2542	}
2261		2543
2262	sub cfg_load {	2544	sub cfg_load {
2263	open my $fh, "<:utf8", cf::confdir . "/config"	2545	open my $fh, "<:utf8", "$CONFDIR/config"
2264	or return;	2546	or return;
2265		2547
2266	local $/;	2548	local $/;
2267	*CFG = YAML::Syck::Load <$fh>;	2549	*CFG = YAML::Syck::Load <$fh>;
2268		2550
…		…
2276	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	2558	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2277	and die "WARNING: m(un)lockall failed: $!\n";	2559	and die "WARNING: m(un)lockall failed: $!\n";
2278	};	2560	};
2279	warn $@ if $@;	2561	warn $@ if $@;
2280	}	2562	}
2281	}
2282
2283	sub init {
2284	init_resources;
2285	}	2563	}
2286		2564
2287	sub main {	2565	sub main {
2288	# we must not ever block the main coroutine	2566	# we must not ever block the main coroutine
2289	local $Coro::idle = sub {	2567	local $Coro::idle = sub {
…		…
2357		2635
2358	warn Carp::longmess "post_cleanup backtrace"	2636	warn Carp::longmess "post_cleanup backtrace"
2359	if $make_core;	2637	if $make_core;
2360	}	2638	}
2361		2639
2362	sub reload() {	2640	sub do_reload_perl() {
2363	# can/must only be called in main	2641	# can/must only be called in main
2364	if ($Coro::current != $Coro::main) {	2642	if ($Coro::current != $Coro::main) {
2365	warn "can only reload from main coroutine";	2643	warn "can only reload from main coroutine";
2366	return;	2644	return;
2367	}	2645	}
…		…
2392	Coro::cede;	2670	Coro::cede;
2393	last unless IO::AIO::nreqs \|\| BDB::nreqs;	2671	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2394	warn "iterate...";	2672	warn "iterate...";
2395	}	2673	}
2396		2674
		2675	++$RELOAD;
		2676
2397	warn "cancelling all extension coros";	2677	warn "cancelling all extension coros";
2398	$_->cancel for values %EXT_CORO;	2678	$_->cancel for values %EXT_CORO;
2399	%EXT_CORO = ();	2679	%EXT_CORO = ();
2400		2680
2401	warn "removing commands";	2681	warn "removing commands";
…		…
2440	Symbol::delete_package "safe::$_"	2720	Symbol::delete_package "safe::$_"
2441	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2721	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2442		2722
2443	warn "unloading cf.pm \"a bit\"";	2723	warn "unloading cf.pm \"a bit\"";
2444	delete $INC{"cf.pm"};	2724	delete $INC{"cf.pm"};
		2725	delete $INC{"cf/pod.pm"};
2445		2726
2446	# don't, removes xs symbols, too,	2727	# don't, removes xs symbols, too,
2447	# and global variables created in xs	2728	# and global variables created in xs
2448	#Symbol::delete_package __PACKAGE__;	2729	#Symbol::delete_package __PACKAGE__;
2449		2730
…		…
2458		2739
2459	warn "loading extensions";	2740	warn "loading extensions";
2460	cf::load_extensions;	2741	cf::load_extensions;
2461		2742
2462	warn "reattaching attachments to objects/players";	2743	warn "reattaching attachments to objects/players";
2463	_global_reattach;	2744	_global_reattach; # objects, sockets
2464	warn "reattaching attachments to maps";	2745	warn "reattaching attachments to maps";
2465	reattach $_ for values %MAP;	2746	reattach $_ for values %MAP;
2466		2747	warn "reattaching attachments to players";
2467	warn "loading reloadable resources";	2748	reattach $_ for values %PLAYER;
2468	init_resources;
2469		2749
2470	warn "leaving sync_job";	2750	warn "leaving sync_job";
2471		2751
2472	1	2752	1
2473	} or do {	2753	} or do {
…		…
2479	warn "reloaded";	2759	warn "reloaded";
2480	};	2760	};
2481		2761
2482	our $RELOAD_WATCHER; # used only during reload	2762	our $RELOAD_WATCHER; # used only during reload
2483		2763
		2764	sub reload_perl() {
		2765	# doing reload synchronously and two reloads happen back-to-back,
		2766	# coro crashes during coro_state_free->destroy here.
		2767
		2768	$RELOAD_WATCHER \|\|= Event->timer (
		2769	reentrant => 0,
		2770	after => 0,
		2771	data => WF_AUTOCANCEL,
		2772	cb => sub {
		2773	do_reload_perl;
		2774	undef $RELOAD_WATCHER;
		2775	},
		2776	);
		2777	}
		2778
2484	register_command "reload" => sub {	2779	register_command "reload" => sub {
2485	my ($who, $arg) = @_;	2780	my ($who, $arg) = @_;
2486		2781
2487	if ($who->flag (FLAG_WIZ)) {	2782	if ($who->flag (FLAG_WIZ)) {
2488	$who->message ("reloading server.");	2783	$who->message ("reloading server.");
2489		2784	async { reload_perl };
2490	# doing reload synchronously and two reloads happen back-to-back,
2491	# coro crashes during coro_state_free->destroy here.
2492
2493	$RELOAD_WATCHER \|\|= Event->timer (
2494	reentrant => 0,
2495	after => 0,
2496	data => WF_AUTOCANCEL,
2497	cb => sub {
2498	reload;
2499	undef $RELOAD_WATCHER;
2500	},
2501	);
2502	}	2785	}
2503	};	2786	};
2504		2787
2505	unshift @INC, $LIBDIR;	2788	unshift @INC, $LIBDIR;
2506		2789
2507	my $bug_warning = 0;	2790	my $bug_warning = 0;
		2791
		2792	our @WAIT_FOR_TICK;
		2793	our @WAIT_FOR_TICK_BEGIN;
		2794
		2795	sub wait_for_tick {
		2796	return unless $TICK_WATCHER->is_active;
		2797	return if $Coro::current == $Coro::main;
		2798
		2799	my $signal = new Coro::Signal;
		2800	push @WAIT_FOR_TICK, $signal;
		2801	$signal->wait;
		2802	}
		2803
		2804	sub wait_for_tick_begin {
		2805	return unless $TICK_WATCHER->is_active;
		2806	return if $Coro::current == $Coro::main;
		2807
		2808	my $signal = new Coro::Signal;
		2809	push @WAIT_FOR_TICK_BEGIN, $signal;
		2810	$signal->wait;
		2811	}
2508		2812
2509	$TICK_WATCHER = Event->timer (	2813	$TICK_WATCHER = Event->timer (
2510	reentrant => 0,	2814	reentrant => 0,
2511	parked => 1,	2815	parked => 1,
2512	prio => 0,	2816	prio => 0,
…		…
2520	}	2824	}
2521		2825
2522	$NOW = Event::time;	2826	$NOW = Event::time;
2523		2827
2524	cf::server_tick; # one server iteration	2828	cf::server_tick; # one server iteration
		2829
2525	$RUNTIME += $TICK;	2830	$RUNTIME += $TICK;
2526	$NEXT_TICK += $TICK;	2831	$NEXT_TICK += $TICK;
2527		2832
2528	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2833	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529	$NEXT_RUNTIME_WRITE = $NOW + 10;	2834	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2531	write_runtime	2836	write_runtime
2532	or warn "ERROR: unable to write runtime file: $!";	2837	or warn "ERROR: unable to write runtime file: $!";
2533	};	2838	};
2534	}	2839	}
2535		2840
2536	$WAIT_FOR_TICK->broadcast;
2537	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2538
2539	# my $AFTER = Event::time;	2841	# my $AFTER = Event::time;
2540	# warn $AFTER - $NOW;#d#	2842	# warn $AFTER - $NOW;#d#
2541		2843
2542	# if we are delayed by four ticks or more, skip them all	2844	# if we are delayed by four ticks or more, skip them all
2543	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2845	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2544		2846
2545	$TICK_WATCHER->at ($NEXT_TICK);	2847	$TICK_WATCHER->at ($NEXT_TICK);
2546	$TICK_WATCHER->start;	2848	$TICK_WATCHER->start;
		2849
		2850	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2851	$sig->send;
		2852	}
		2853	while (my $sig = shift @WAIT_FOR_TICK) {
		2854	$sig->send;
		2855	}
		2856
		2857	_post_tick;
2547	},	2858	},
2548	);	2859	);
2549		2860
2550	{	2861	{
2551	BDB::max_poll_time $TICK * 0.1;	2862	BDB::max_poll_time $TICK * 0.1;
…		…
2579		2890
2580	cf::sync_job {	2891	cf::sync_job {
2581	eval {	2892	eval {
2582	BDB::db_env_open	2893	BDB::db_env_open
2583	$DB_ENV,	2894	$DB_ENV,
2584	$BDB_ENV_DIR,	2895	$BDBDIR,
2585	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2896	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2586	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2897	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2587	0666;	2898	0666;
2588		2899
2589	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2900	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2590		2901
2591	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2902	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2592	$DB_ENV->set_lk_detect;	2903	$DB_ENV->set_lk_detect;
2593	};	2904	};
2594		2905
…		…
2610	prio => 6,	2921	prio => 6,
2611	cb => \&IO::AIO::poll_cb,	2922	cb => \&IO::AIO::poll_cb,
2612	);	2923	);
2613	}	2924	}
2614		2925
		2926	# load additional modules
		2927	use cf::pod;
		2928
2615	END { cf::emergency_save }	2929	END { cf::emergency_save }
2616		2930
2617	1	2931	1
2618		2932

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC vs. Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC vs.
Revision 1.257 by root, Sat Apr 21 17:34:24 2007 UTC