ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
21 25
26use JSON::XS ();
22use BDB (); 27use BDB ();
23use Data::Dumper; 28use Data::Dumper;
24use Digest::MD5; 29use Digest::MD5;
25use Fcntl; 30use Fcntl;
26use YAML::Syck (); 31use YAML::Syck ();
27use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
31# configure various modules to our taste 37# configure various modules to our taste
32# 38#
39$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 42
36$Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
37 44
45our %COMMAND = (); 52our %COMMAND = ();
46our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
47 54
48our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
52 60
53our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
54our @EVENT; 62our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 63
57our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 77our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 80our $NEXT_TICK;
62our $NOW; 81our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
64 83
65our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
66our $DB_ENV; 88our $DB_ENV;
67 89
68our %CFG; 90our %CFG;
69 91
70our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
71our $RUNTIME; 93our $RUNTIME;
72 94
73our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
74our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
75our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 98
82# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
105
85binmode STDOUT; 106binmode STDOUT;
86binmode STDERR; 107binmode STDERR;
87 108
88# read virtual server time, if available 109# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 110unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 111 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 112 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 113 $RUNTIME = <$fh> + 0.;
93} 114}
94 115
95mkdir cf::localdir; 116mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 118
102our $EMERGENCY_POSITION; 119our $EMERGENCY_POSITION;
103 120
104sub cf::map::normalise; 121sub cf::map::normalise;
105 122
116=item $cf::RUNTIME 133=item $cf::RUNTIME
117 134
118The time this server has run, starts at 0 and is increased by $cf::TICK on 135The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 136every server tick.
120 137
121=item $cf::LIBDIR 138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 141
123The perl library directory, where extensions and cf-specific modules can 142Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 143directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and
145database environment.
125 146
126=item $cf::NOW 147=item $cf::NOW
127 148
128The time of the last (current) server tick. 149The time of the last (current) server tick.
129 150
130=item $cf::TICK 151=item $cf::TICK
131 152
132The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
133 164
134=item %cf::CFG 165=item %cf::CFG
135 166
136Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 168from wherever your confdir points to.
138 169
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 170=item cf::wait_for_tick, cf::wait_for_tick_begin
140 171
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 173returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick. 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
145 181
146=back 182=back
147 183
148=cut 184=cut
149 185
150BEGIN { 186BEGIN {
151 *CORE::GLOBAL::warn = sub { 187 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 188 my $msg = join "", @_;
153 utf8::encode $msg;
154 189
155 $msg .= "\n" 190 $msg .= "\n"
156 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
192
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
157 194
158 LOG llevError, $msg; 195 LOG llevError, $msg;
159 }; 196 };
160} 197}
161 198
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 206
169# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 208# within the Safe compartment.
171for my $pkg (qw( 209for my $pkg (qw(
172 cf::global cf::attachable 210 cf::global cf::attachable
180} 218}
181 219
182$Event::DIED = sub { 220$Event::DIED = sub {
183 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
184}; 222};
223
224#############################################################################
185 225
186=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
187 227
188=over 4 228=over 4
189 229
208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
209 $d 249 $d
210 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
211} 251}
212 252
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
216 254
217Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
218 256
219=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
220 258
221Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
222 267
223=item cf::lock_wait $string 268=item cf::lock_wait $string
224 269
225Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
226 271
229Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
230a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
231for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
232returned. 277returned.
233 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
234Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
236 284
285=item $locked = cf::lock_active $string
286
287Return true if the lock is currently active, i.e. somebody has locked it.
288
237=cut 289=cut
238 290
239our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
240 293
241sub lock_wait($) { 294sub lock_wait($) {
242 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
243 301
244 # wait for lock, if any 302 # wait for lock, if any
245 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
246 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
247 Coro::schedule; 305 Coro::schedule;
253 311
254 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
255 lock_wait $key; 313 lock_wait $key;
256 314
257 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
258 317
259 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
260 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
262 } 322 }
323}
324
325sub lock_active($) {
326 my ($key) = @_;
327
328 ! ! $LOCK{$key}
263} 329}
264 330
265sub freeze_mainloop { 331sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 332 return unless $TICK_WATCHER->is_active;
267 333
270 }; 336 };
271 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
272 $guard 338 $guard
273} 339}
274 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
275=item cf::async { BLOCK } 399=item cf::async { BLOCK }
276 400
277Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
282 406
283BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
284 408
285=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
286 410
287The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
290 415
291If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
294fast or be very important. 419fast or be very important.
297 422
298sub sync_job(&) { 423sub sync_job(&) {
299 my ($job) = @_; 424 my ($job) = @_;
300 425
301 if ($Coro::current == $Coro::main) { 426 if ($Coro::current == $Coro::main) {
427 my $time = Event::time;
428
302 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
304 431
305 # TODO: use suspend/resume instead 432 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 433 # (but this is cancel-safe)
308 435
309 my $busy = 1; 436 my $busy = 1;
310 my @res; 437 my @res;
311 438
312 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
313 @res = eval { $job->() }; 441 @res = eval { $job->() };
314 warn $@ if $@; 442 warn $@ if $@;
315 undef $busy; 443 undef $busy;
316 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
317 445
318 while ($busy) { 446 while ($busy) {
319 Coro::cede or Event::one_event; 447 Coro::cede or Event::one_event;
320 } 448 }
449
450 $time = Event::time - $time;
451
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load
321 456
322 wantarray ? @res : $res[0] 457 wantarray ? @res : $res[0]
323 } else { 458 } else {
324 # we are in another coroutine, how wonderful, everything just works 459 # we are in another coroutine, how wonderful, everything just works
325 460
345 $EXT_CORO{$coro+0} = $coro; 480 $EXT_CORO{$coro+0} = $coro;
346 481
347 $coro 482 $coro
348} 483}
349 484
350sub write_runtime { 485=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 486
353 my $runtime = cf::localdir . "/runtime"; 487Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling.
354 491
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 492=cut
356 or return;
357 493
358 my $value = $cf::RUNTIME + 90 + 10; 494sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 495 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 496
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 497 # we seemingly have to make a local copy of the whole thing,
363 and return; 498 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious)
364 500
365 # always fsync - this file is important 501 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 502 reset_signals;
367 and return; 503 &$cb
504 }, @args;
368 505
369 close $fh 506 wantarray ? @res : $res[-1]
370 or return; 507}
371 508
372 aio_rename "$runtime~", $runtime 509=item $value = cf::db_get $family => $key
373 and return;
374 510
511Returns a single value from the environment database.
512
513=item cf::db_put $family => $key => $value
514
515Stores the given C<$value> in the family. It can currently store binary
516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
541
542our $DB;
543
544sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db";
547 };
548}
549
550sub db_get($$) {
551 my $key = "$_[0]/$_[1]";
552
553 cf::sync_job {
554 BDB::db_get $DB, undef, $key, my $data;
555
556 $! ? ()
557 : $data
375 1 558 }
559}
560
561sub db_put($$$) {
562 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
564}
565
566=item cf::cache $id => [$paths...], $processversion => $process
567
568Generic caching function that returns the value of the resource $id,
569caching and regenerating as required.
570
571This function can block.
572
573=cut
574
575sub cache {
576 my ($id, $src, $processversion, $process) = @_;
577
578 my $meta =
579 join "\x00",
580 $processversion,
581 map {
582 aio_stat $_
583 and Carp::croak "$_: $!";
584
585 ($_, (stat _)[7,9])
586 } @$src;
587
588 my $dbmeta = db_get cache => "$id/meta";
589 if ($dbmeta ne $meta) {
590 # changed, we may need to process
591
592 my @data;
593 my $md5;
594
595 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_]
597 or Carp::croak "$src->[$_]: $!";
598 }
599
600 # if processing is expensive, check
601 # checksum first
602 if (1) {
603 $md5 =
604 join "\x00",
605 $processversion,
606 map {
607 cf::cede_to_tick;
608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
609 } 0.. $#$src;
610
611
612 my $dbmd5 = db_get cache => "$id/md5";
613 if ($dbmd5 eq $md5) {
614 db_put cache => "$id/meta", $meta;
615
616 return db_get cache => "$id/data";
617 }
618 }
619
620 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time;
623
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
625
626 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta;
629
630 return $data;
631 }
632
633 db_get cache => "$id/data"
376} 634}
377 635
378=item cf::datalog type => key => value, ... 636=item cf::datalog type => key => value, ...
379 637
380Log a datalog packet of the given type with the given key-value pairs. 638Log a datalog packet of the given type with the given key-value pairs.
398attach callbacks/event handlers (a collection of which is called an "attachment") 656attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 657to it. All such attachable objects support the following methods.
400 658
401In the following description, CLASS can be any of C<global>, C<object> 659In the following description, CLASS can be any of C<global>, C<object>
402C<player>, C<client> or C<map> (i.e. the attachable objects in 660C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 661Crossfire TRT).
404 662
405=over 4 663=over 4
406 664
407=item $attachable->attach ($attachment, key => $value...) 665=item $attachable->attach ($attachment, key => $value...)
408 666
571 $registry = $CB_TYPE[$object_type] ||= []; 829 $registry = $CB_TYPE[$object_type] ||= [];
572 830
573 } elsif ($type eq "subtype") { 831 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 832 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 833 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 834 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 835
578 } elsif ($type eq "package") { 836 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 837 my $pkg = shift @arg;
580 838
581 while (my ($name, $id) = each %cb_id) { 839 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 868 _attach $registry, $klass, @attach;
611 } 869 }
612 870
613 $obj->{$name} = \%arg; 871 $obj->{$name} = \%arg;
614 } else { 872 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 873 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 874 }
617 875
618 $obj->{_attachment}{$name} = undef; 876 $obj->{_attachment}{$name} = undef;
619} 877}
620 878
622 if (ref $_[0]) { 880 if (ref $_[0]) {
623 _object_attach @_; 881 _object_attach @_;
624 } else { 882 } else {
625 _attach shift->_attach_registry, @_; 883 _attach shift->_attach_registry, @_;
626 } 884 }
885 _recalc_want;
627}; 886};
628 887
629# all those should be optimised 888# all those should be optimised
630sub cf::attachable::detach { 889sub cf::attachable::detach {
631 my ($obj, $name) = @_; 890 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 893 delete $obj->{_attachment}{$name};
635 reattach ($obj); 894 reattach ($obj);
636 } else { 895 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 896 Carp::croak "cannot, currently, detach class attachments";
638 } 897 }
898 _recalc_want;
639}; 899};
640 900
641sub cf::attachable::attached { 901sub cf::attachable::attached {
642 my ($obj, $name) = @_; 902 my ($obj, $name) = @_;
643 903
658 "; 918 ";
659 die if $@; 919 die if $@;
660} 920}
661 921
662our $override; 922our $override;
663our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 923our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
664 924
665sub override { 925sub override {
666 $override = 1; 926 $override = 1;
667 @invoke_results = (); 927 @INVOKE_RESULTS = (@_);
668} 928}
669 929
670sub do_invoke { 930sub do_invoke {
671 my $event = shift; 931 my $event = shift;
672 my $callbacks = shift; 932 my $callbacks = shift;
673 933
674 @invoke_results = (); 934 @INVOKE_RESULTS = ();
675 935
676 local $override; 936 local $override;
677 937
678 for (@$callbacks) { 938 for (@$callbacks) {
679 eval { &{$_->[1]} }; 939 eval { &{$_->[1]} };
696 956
697Generate an object-specific event with the given arguments. 957Generate an object-specific event with the given arguments.
698 958
699This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 959This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
700removed in future versions), and there is no public API to access override 960removed in future versions), and there is no public API to access override
701results (if you must, access C<@cf::invoke_results> directly). 961results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 962
703=back 963=back
704 964
705=cut 965=cut
706 966
707############################################################################# 967#############################################################################
708# object support 968# object support
969#
970
971sub _can_merge {
972 my ($ob1, $ob2) = @_;
973
974 local $Storable::canonical = 1;
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977
978 $fob1 eq $fob2
979}
709 980
710sub reattach { 981sub reattach {
711 # basically do the same as instantiate, without calling instantiate 982 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 983 my ($obj) = @_;
713 984
760sub object_freezer_save { 1031sub object_freezer_save {
761 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
762 1033
763 sync_job { 1034 sync_job {
764 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
765 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
766 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
767 1039
768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
769 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
770 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
771 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
790 } 1062 }
791 } else { 1063 } else {
792 aio_unlink $filename; 1064 aio_unlink $filename;
793 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
794 } 1066 }
795 } 1067 };
796} 1068}
797 1069
798sub object_freezer_as_string { 1070sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
800 1072
812 or return; 1084 or return;
813 1085
814 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
815 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
816 or return; 1088 or return;
1089
817 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1091 }
819 1092
1093 utf8::decode (my $decname = $filename);
820 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1095 $decname, length $data, scalar @{$av || []};
1096
822 return ($data, $av); 1097 ($data, $av)
823} 1098}
1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
824 1105
825############################################################################# 1106#############################################################################
826# command handling &c 1107# command handling &c
827 1108
828=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1123}
843 1124
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1126
846Register a callbackf ro execution when the client sends an extcmd packet. 1127Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is
1130the logged-in player. Ext commands can only be processed after a player
1131has logged in successfully.
847 1132
848If the callback returns something, it is sent back as if reply was being 1133If the callback returns something, it is sent back as if reply was being
849called. 1134called.
850 1135
1136=item cf::register_exticmd $name => \&callback($ns,$packet);
1137
1138Register a callback for execution when the client sends an (asynchronous)
1139exticmd packet. Exti commands are processed by the server as soon as they
1140are received, i.e. out of order w.r.t. other commands. The first argument
1141is a client socket. Exti commands can be received anytime, even before
1142log-in.
1143
1144If the callback returns something, it is sent back as if reply was being
1145called.
1146
851=cut 1147=cut
852 1148
853sub register_extcmd { 1149sub register_extcmd {
854 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
855 1151
856 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
857} 1159}
858 1160
859cf::player->attach ( 1161cf::player->attach (
860 on_command => sub { 1162 on_command => sub {
861 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
870 cf::override; 1172 cf::override;
871 }, 1173 },
872 on_extcmd => sub { 1174 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
874 1176
875 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1178
877 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
883 } else { 1194 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1196 }
886 1197
887 cf::override; 1198 cf::override;
888 }, 1199 },
889); 1200);
890 1201
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1202sub load_extensions {
1203 cf::sync_job {
1204 my %todo;
1205
926 for my $ext (<$LIBDIR/*.ext>) { 1206 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1207 next unless -r $path;
928 eval { 1208
929 load_extension $ext; 1209 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1210 my $base = $1;
1211 my $pkg = $1;
1212 $pkg =~ s/[^[:word:]]/_/g;
1213 $pkg = "ext::$pkg";
1214
1215 open my $fh, "<:utf8", $path
1216 or die "$path: $!";
1217
1218 my $source = do { local $/; <$fh> };
1219
1220 my %ext = (
1221 path => $path,
1222 base => $base,
1223 pkg => $pkg,
1224 );
1225
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228
1229 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n"
1232 . $source
1233 . "\n};\n1";
1234
1235 $todo{$base} = \%ext;
1236 }
1237
1238 my %done;
1239 while (%todo) {
1240 my $progress;
1241
1242 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip
1245 unless exists $done{$_};
1246 }
1247
1248 warn "... loading '$k' into '$v->{pkg}'\n";
1249
1250 unless (eval $v->{source}) {
1251 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n";
1253
1254 if (exists $v->{meta}{mandatory}) {
1255 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n";
1257 exit 1;
1258 }
1259
1260 warn $msg;
1261 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
930 1 1266 }
931 } or warn "$ext not loaded: $@"; 1267
1268 skip:
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1270 unless $progress;
1271 }
932 } 1272 };
933} 1273}
934 1274
935############################################################################# 1275#############################################################################
936 1276
1277=back
1278
937=head2 CORE EXTENSIONS 1279=head2 CORE EXTENSIONS
938 1280
939Functions and methods that extend core crossfire objects. 1281Functions and methods that extend core crossfire objects.
940 1282
941=cut 1283=cut
946 1288
947=head3 cf::player 1289=head3 cf::player
948 1290
949=over 4 1291=over 4
950 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
951=item cf::player::find $login 1307=item cf::player::find $login
952 1308
953Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
954 1310
955=cut 1311=cut
956 1312
957sub playerdir($) { 1313sub playerdir($) {
958 cf::localdir 1314 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1315 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1316}
964 1317
965sub path($) { 1318sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1319 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1320
968 (playerdir $login) . "/$login.pl" 1321 (playerdir $login) . "/playerdata"
969} 1322}
970 1323
971sub find_active($) { 1324sub find_active($) {
972 $cf::PLAYER{$_[0]} 1325 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1326 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1339 my $login = $_[0];
987 1340
988 my $guard = cf::lock_acquire "user_find:$login"; 1341 my $guard = cf::lock_acquire "user_find:$login";
989 1342
990 $cf::PLAYER{$_[0]} || do { 1343 $cf::PLAYER{$_[0]} || do {
991 my $pl = load_pl path $login 1344 # rename old playerfiles to new ones
1345 #TODO: remove when no longer required
1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1349 aio_unlink +(playerdir $login) . "/$login.pl";
1350
1351 my $f = new_from_file cf::object::thawer path $login
992 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
993 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
994 } 1359 }
995 } 1360 }
996} 1361}
997 1362
1007 1372
1008 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1009 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1010 1375
1011 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1012 Coro::cede; 1377 cf::cede_to_tick;
1013} 1378}
1014 1379
1015sub new($) { 1380sub new($) {
1016 my ($login) = @_; 1381 my ($login) = @_;
1017 1382
1021 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1022 1387
1023 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1024 1389
1025 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1026} 1401}
1027 1402
1028=item $pl->quit_character 1403=item $pl->quit_character
1029 1404
1030Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1079while and may block, so not sync_job-capable, ever. 1454while and may block, so not sync_job-capable, ever.
1080 1455
1081=cut 1456=cut
1082 1457
1083sub list_logins { 1458sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1459 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1460 or return [];
1086 1461
1087 my @logins; 1462 my @logins;
1088 1463
1089 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1090 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1091 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1092 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1093 1473
1094 utf8::decode $login; 1474 utf8::decode $login;
1095 push @logins, $login; 1475 push @logins, $login;
1096 } 1476 }
1097 1477
1124 } 1504 }
1125 1505
1126 \@paths 1506 \@paths
1127} 1507}
1128 1508
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1510
1511Expand crossfire pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559
1129=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1130 1561
1131Sends an ext reply to the player. 1562Sends an ext reply to the player.
1132 1563
1133=cut 1564=cut
1134 1565
1135sub ext_reply($$%) { 1566sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1137 1568
1138 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1570}
1142 1571
1143=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1144 1573
1145Sends an ext event to the client. 1574Sends an ext event to the client.
1146 1575
1147=cut 1576=cut
1148 1577
1149sub ext_event($$%) { 1578sub ext_msg($$@) {
1150 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1151 1580
1152 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1153} 1582}
1154 1583
1155package cf; 1584=head3 cf::region
1585
1586=over 4
1587
1588=cut
1589
1590package cf::region;
1591
1592=item cf::region::find_by_path $path
1593
1594Tries to decuce the likely region for a map knowing only its path.
1595
1596=cut
1597
1598sub find_by_path($) {
1599 my ($path) = @_;
1600
1601 my ($match, $specificity);
1602
1603 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) {
1605 ($match, $specificity) = ($region, $region->specificity)
1606 if $region->specificity > $specificity;
1607 }
1608 }
1609
1610 $match
1611}
1156 1612
1157=back 1613=back
1158
1159 1614
1160=head3 cf::map 1615=head3 cf::map
1161 1616
1162=over 4 1617=over 4
1163 1618
1218 my ($self, $merge) = @_; 1673 my ($self, $merge) = @_;
1219 1674
1220 # we have to keep some variables in memory intact 1675 # we have to keep some variables in memory intact
1221 local $self->{path}; 1676 local $self->{path};
1222 local $self->{load_path}; 1677 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1678
1226 $self->SUPER::thawer_merge ($merge); 1679 $self->SUPER::thawer_merge ($merge);
1227} 1680}
1228 1681
1229sub normalise { 1682sub normalise {
1276 $self->init; # pass $1 etc. 1729 $self->init; # pass $1 etc.
1277 return $self; 1730 return $self;
1278 } 1731 }
1279 } 1732 }
1280 1733
1281 Carp::carp "unable to resolve path '$path' (base '$base')."; 1734 Carp::cluck "unable to resolve path '$path' (base '$base').";
1282 () 1735 ()
1283} 1736}
1284 1737
1285sub init { 1738sub init {
1286 my ($self) = @_; 1739 my ($self) = @_;
1301 1754
1302# the original (read-only) location 1755# the original (read-only) location
1303sub load_path { 1756sub load_path {
1304 my ($self) = @_; 1757 my ($self) = @_;
1305 1758
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1759 "$MAPDIR/$self->{path}.map"
1307} 1760}
1308 1761
1309# the temporary/swap location 1762# the temporary/swap location
1310sub save_path { 1763sub save_path {
1311 my ($self) = @_; 1764 my ($self) = @_;
1312 1765
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1767 "$TMPDIR/$path.map"
1315} 1768}
1316 1769
1317# the unique path, undef == no special unique path 1770# the unique path, undef == no special unique path
1318sub uniq_path { 1771sub uniq_path {
1319 my ($self) = @_; 1772 my ($self) = @_;
1320 1773
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1775 "$UNIQUEDIR/$path"
1323} 1776}
1324 1777
1325# and all this just because we cannot iterate over 1778# and all this just because we cannot iterate over
1326# all maps in C++... 1779# all maps in C++...
1327sub change_all_map_light { 1780sub change_all_map_light {
1329 1782
1330 $_->change_map_light ($change) 1783 $_->change_map_light ($change)
1331 for grep $_->outdoor, values %cf::MAP; 1784 for grep $_->outdoor, values %cf::MAP;
1332} 1785}
1333 1786
1787sub decay_objects {
1788 my ($self) = @_;
1789
1790 return if $self->{deny_reset};
1791
1792 $self->do_decay_objects;
1793}
1794
1334sub unlink_save { 1795sub unlink_save {
1335 my ($self) = @_; 1796 my ($self) = @_;
1336 1797
1337 utf8::encode (my $save = $self->save_path); 1798 utf8::encode (my $save = $self->save_path);
1338 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1799 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1341 1802
1342sub load_header_from($) { 1803sub load_header_from($) {
1343 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1344 1805
1345 utf8::encode $path; 1806 utf8::encode $path;
1346 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1347 # or return;
1348
1349 $self->_load_header ($path)
1350 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1351 1815
1352 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1353 1817
1354 1 1818 1
1355} 1819}
1394 $self->load_header_orig 1858 $self->load_header_orig
1395 or return; 1859 or return;
1396 $self->prepare_orig; 1860 $self->prepare_orig;
1397 } 1861 }
1398 1862
1863 $self->{deny_reset} = 1
1864 if $self->no_reset;
1865
1866 $self->default_region (cf::region::find_by_path $self->{path})
1867 unless $self->default_region;
1868
1399 1 1869 1
1400} 1870}
1401 1871
1402sub find; 1872sub find;
1403sub find { 1873sub find {
1404 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1405 1875
1406 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1407 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1408 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1409 1880
1410 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1411 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1412 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1413 or return; 1886 or return;
1414 1887
1415 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1416 1889
1417 $map->load_header 1890 $map->load_header
1418 or return; 1891 or return;
1419 1892
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1423 $map->reset; 1898 $map->reset;
1424 undef $guard;
1425 return find $path; 1899 return find $path;
1426 } 1900 }
1427 1901
1428 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1429 } 1903 }
1436 my ($self) = @_; 1910 my ($self) = @_;
1437 1911
1438 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1439 1913
1440 my $path = $self->{path}; 1914 my $path = $self->{path};
1915
1916 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1442 1918
1919 return unless $self->valid;
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1444 1921
1445 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1446 1923
1447 $self->alloc; 1924 $self->alloc;
1448 1925
1449 $self->pre_load; 1926 $self->pre_load;
1927 cf::cede_to_tick;
1450 1928
1451 $self->_load_objects ($self->{load_path}, 1) 1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1931 $self->_load_objects ($f)
1452 or return; 1932 or return;
1453 1933
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1456 1936
1457 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq; 1938 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1460 $self->clear_unique_items; 1941 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1462 } 1945 }
1463 } 1946 }
1464 1947
1465 Coro::cede; 1948 $f->resolve_delayed_derefs;
1466 1949
1950 cf::cede_to_tick;
1467 # now do the right thing for maps 1951 # now do the right thing for maps
1468 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede;
1475 $self->set_darkness_map;
1476 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1954 unless $self->difficulty;
1478 Coro::cede; 1955 cf::cede_to_tick;
1956
1957 unless ($self->{deny_activate}) {
1958 $self->decay_objects;
1959 $self->fix_auto_apply;
1960 $self->update_buttons;
1961 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1479 $self->activate; 1964 $self->activate;
1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1969
1970 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1971 }
1481 1972
1482 $self->post_load; 1973 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1974}
1486 1975
1487sub customise_for { 1976sub customise_for {
1488 my ($self, $ob) = @_; 1977 my ($self, $ob) = @_;
1489 1978
1490 return find "~" . $ob->name . "/" . $self->{path} 1979 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1980 if $self->per_player;
1492 1981
1982# return find "?party/" . $ob->name . "/" . $self->{path}
1983# if $self->per_party;
1984
1493 $self 1985 $self
1494} 1986}
1495 1987
1496# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1497sub load_diag { 1989sub load_neighbours {
1498 my ($map) = @_; 1990 my ($map) = @_;
1499 1991
1500 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1501 1993
1502 for (0 .. 3) { 1994 for (0 .. 3) {
1503 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1504 or next; 1996 or next;
1505 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1506 or next; 1998 or next;
1507 $neigh->load; 1999 $neigh->load;
1508 2000
2001 push @neigh,
1509 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1510 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1511 } 2004 }
1512 2005
1513 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1514 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1515 or next; 2009 or next;
1516 $neigh->load; 2010 $neigh->load;
1517 } 2011 }
1518} 2012}
1519 2013
1524} 2018}
1525 2019
1526sub do_load_sync { 2020sub do_load_sync {
1527 my ($map) = @_; 2021 my ($map) = @_;
1528 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1529 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1530} 2027}
1531 2028
1532our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1533our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1534 2031
1535sub find_async { 2032sub find_async {
1536 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1537 2034
1538 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1539 2036
1540 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1541 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1542 } 2039 }
1543 2040
1544 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1545 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1546 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1547 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1548 my $map = find $path 2048 if (my $map = find $k) {
1549 or next;
1550 $map->load; 2049 $map->load if $v;
2050 }
1551 2051
1552 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1553 } 2053 }
1554 } 2054 }
1555 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1556 }; 2056 };
1557 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1560} 2060}
1561 2061
1562sub save { 2062sub save {
1563 my ($self) = @_; 2063 my ($self) = @_;
1564 2064
1565 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1566 2066
1567 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1568 2068
1569 return unless $self->dirty; 2069 return unless $self->dirty;
1570 2070
1576 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1577 2077
1578 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1579 2079
1580 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1581 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1582 }; 2083 };
1583 2084
1584 if ($uniq) { 2085 if ($uniq) {
1585 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1593 my ($self) = @_; 2094 my ($self) = @_;
1594 2095
1595 # save first because save cedes 2096 # save first because save cedes
1596 $self->save; 2097 $self->save;
1597 2098
1598 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1599 2100
1600 return if $self->players; 2101 return if $self->players;
1601 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1602 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1603 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1604 $self->clear; 2109 $self->clear;
1605 $self->in_memory (cf::MAP_SWAPPED);
1606} 2110}
1607 2111
1608sub reset_at { 2112sub reset_at {
1609 my ($self) = @_; 2113 my ($self) = @_;
1610 2114
1611 # TODO: safety, remove and allow resettable per-player maps 2115 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 2116 return 1e99 if $self->{deny_reset};
1614 2117
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1617 2120
1628 my ($self) = @_; 2131 my ($self) = @_;
1629 2132
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 2134
1632 return if $self->players; 2135 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 2136
1635 warn "resetting map ", $self->path;#d# 2137 warn "resetting map ", $self->path;
1636 2138
1637 $self->in_memory (cf::MAP_SWAPPED); 2139 $self->in_memory (cf::MAP_SWAPPED);
1638 2140
1639 # need to save uniques path 2141 # need to save uniques path
1640 unless ($self->{deny_save}) { 2142 unless ($self->{deny_save}) {
1644 if $uniq; 2146 if $uniq;
1645 } 2147 }
1646 2148
1647 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
1648 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
1649 $self->clear; 2153 $self->clear;
1650
1651 $_->clear_links_to ($self) for values %cf::MAP;
1652 2154
1653 $self->unlink_save; 2155 $self->unlink_save;
1654 $self->destroy; 2156 $self->destroy;
1655} 2157}
1656 2158
1657my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
1658 2160
1659sub nuke { 2161sub nuke {
1660 my ($self) = @_; 2162 my ($self) = @_;
1661 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
1662 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
1663 2168
1664 $self->unlink_save; 2169 $self->unlink_save;
1665 2170
1666 bless $self, "cf::map"; 2171 bless $self, "cf::map";
1667 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
1668 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
1669 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
1670 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1671 2176
1672 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
1673 2179
1674 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2181}
2182
2183=item $maps = cf::map::tmp_maps
2184
2185Returns an arrayref with all map paths of currently instantiated and saved
2186maps. May block.
2187
2188=cut
2189
2190sub tmp_maps() {
2191 [
2192 map {
2193 utf8::decode $_;
2194 /\.map$/
2195 ? normalise $_
2196 : ()
2197 } @{ aio_readdir $TMPDIR or [] }
2198 ]
2199}
2200
2201=item $maps = cf::map::random_maps
2202
2203Returns an arrayref with all map paths of currently instantiated and saved
2204random maps. May block.
2205
2206=cut
2207
2208sub random_maps() {
2209 [
2210 map {
2211 utf8::decode $_;
2212 /\.map$/
2213 ? normalise "?random/$_"
2214 : ()
2215 } @{ aio_readdir $RANDOMDIR or [] }
2216 ]
1675} 2217}
1676 2218
1677=item cf::map::unique_maps 2219=item cf::map::unique_maps
1678 2220
1679Returns an arrayref of paths of all shared maps that have 2221Returns an arrayref of paths of all shared maps that have
1680instantiated unique items. May block. 2222instantiated unique items. May block.
1681 2223
1682=cut 2224=cut
1683 2225
1684sub unique_maps() { 2226sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2227 [
1686 or return; 2228 map {
1687
1688 my @paths;
1689
1690 for (@$files) {
1691 utf8::decode $_; 2229 utf8::decode $_;
1692 next if /\.pst$/; 2230 /\.map$/
1693 next unless /^$PATH_SEP/o; 2231 ? normalise $_
1694 2232 : ()
1695 push @paths, cf::map::normalise $_; 2233 } @{ aio_readdir $UNIQUEDIR or [] }
1696 } 2234 ]
1697
1698 \@paths
1699} 2235}
1700 2236
1701package cf; 2237package cf;
1702 2238
1703=back 2239=back
1721 map { $_, inv_recursive_ $_->inv } @_ 2257 map { $_, inv_recursive_ $_->inv } @_
1722} 2258}
1723 2259
1724sub inv_recursive { 2260sub inv_recursive {
1725 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2262}
2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
1726} 2293}
1727 2294
1728package cf; 2295package cf;
1729 2296
1730=back 2297=back
1749 2316
1750 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2317 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1751 2318
1752 if ($self->{record_replies}) { 2319 if ($self->{record_replies}) {
1753 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2320 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2321
1754 } else { 2322 } else {
2323 my $pl = $self->contr;
2324
2325 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2326 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328
2329 } else {
1755 $msg = $npc->name . " says: $msg" if $npc; 2330 $msg = $npc->name . " says: $msg" if $npc;
1756 $self->message ($msg, $flags); 2331 $self->message ($msg, $flags);
2332 }
1757 } 2333 }
2334}
2335
2336=item $object->send_msg ($channel, $msg, $color, [extra...])
2337
2338=cut
2339
2340sub cf::object::send_msg {
2341 my $pl = shift->contr
2342 or return;
2343 $pl->send_msg (@_);
1758} 2344}
1759 2345
1760=item $player_object->may ("access") 2346=item $player_object->may ("access")
1761 2347
1762Returns wether the given player is authorized to access resource "access" 2348Returns wether the given player is authorized to access resource "access"
1809 $self->deactivate_recursive; 2395 $self->deactivate_recursive;
1810 2396
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2397 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 2398
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 2400 if $self->map && $self->map->{path} ne "{link}";
1815 2401
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2402 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 2403}
1818 2404
1819sub cf::object::player::leave_link { 2405sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 2406 my ($self, $map, $x, $y) = @_;
2407
2408 return unless $self->contr->active;
1821 2409
1822 my $link_pos = delete $self->{_link_pos}; 2410 my $link_pos = delete $self->{_link_pos};
1823 2411
1824 unless ($map) { 2412 unless ($map) {
1825 # restore original map position 2413 # restore original map position
1839 # use -1 or undef as default coordinates, not 0, 0 2427 # use -1 or undef as default coordinates, not 0, 0
1840 ($x, $y) = ($map->enter_x, $map->enter_y) 2428 ($x, $y) = ($map->enter_x, $map->enter_y)
1841 if $x <=0 && $y <= 0; 2429 if $x <=0 && $y <= 0;
1842 2430
1843 $map->load; 2431 $map->load;
1844 $map->load_diag; 2432 $map->load_neighbours;
1845 2433
1846 return unless $self->contr->active; 2434 return unless $self->contr->active;
1847 $self->activate_recursive; 2435 $self->activate_recursive;
1848 2436
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 2438 $self->enter_map ($map, $x, $y);
1851} 2439}
1852 2440
1853cf::player->attach ( 2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1854 on_logout => sub {
1855 my ($pl) = @_;
1856 2442
1857 # abort map switching before logout 2443Moves the player to the given map-path and coordinates by first freezing
1858 if ($pl->ob->{_link_pos}) { 2444her, loading and preparing them map, calling the provided $check callback
1859 cf::sync_job { 2445that has to return the map if sucecssful, and then unfreezes the player on
1860 $pl->ob->leave_link 2446the new (success) or old (failed) map position. In either case, $done will
1861 }; 2447be called at the end of this process.
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866 2448
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y)
1886
1887=cut 2449=cut
2450
2451our $GOTOGEN;
1888 2452
1889sub cf::object::player::goto { 2453sub cf::object::player::goto {
1890 my ($self, $path, $x, $y) = @_; 2454 my ($self, $path, $x, $y, $check, $done) = @_;
2455
2456 # do generation counting so two concurrent goto's will be executed in-order
2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1891 2458
1892 $self->enter_link; 2459 $self->enter_link;
1893 2460
1894 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
1895 my $map = eval { 2483 my $map = eval {
1896 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2485
2486 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 2487 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map;
2489 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 }
2492
1898 $map 2493 $map
2494 };
2495
2496 if ($@) {
2497 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2498 LOG llevError | logBacktrace, Carp::longmess $@;
1899 } or 2499 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 2500
2501 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2504 }
2505
2506 $done->() if $done;
1903 })->prio (1); 2507 })->prio (1);
1904} 2508}
1905 2509
1906=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
1907 2511
1946 2550
1947 $rmp->{random_seed} ||= $exit->random_seed; 2551 $rmp->{random_seed} ||= $exit->random_seed;
1948 2552
1949 my $data = cf::to_json $rmp; 2553 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2554 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2555 my $meta = "$RANDOMDIR/$md5.meta";
1952 2556
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2558 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2559 undef $fh;
1956 aio_rename "$meta~", $meta; 2560 aio_rename "$meta~", $meta;
1965 2569
1966 return unless $self->type == cf::PLAYER; 2570 return unless $self->type == cf::PLAYER;
1967 2571
1968 if ($exit->slaying eq "/!") { 2572 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2576 cf::sync_job { prepare_random_map $exit };
1971 } 2577 }
1972 2578
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
1975 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
1976 2582
1977 $self->enter_link; 2583 $self->enter_link;
1978 2584
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
1979 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
1980 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
1981 unless (eval { 2593 unless (eval {
1982 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
1983 2595
1984 1; 2596 1;
1985 }) { 2597 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2598 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2599 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2600 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2601 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2602
1991 warn "ERROR in enter_exit: $@"; 2603 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2604 $self->leave_link;
1993 } 2605 }
1994 })->prio (1); 2606 })->prio (1);
2010 2622
2011 utf8::encode $text; 2623 utf8::encode $text;
2012 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2624 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2013} 2625}
2014 2626
2627=item $client->send_msg ($channel, $msg, $color, [extra...])
2628
2629Send a drawinfo or msg packet to the client, formatting the msg for the
2630client if neccessary. C<$type> should be a string identifying the type of
2631the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet.
2633
2634=cut
2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "identify",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "examine",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649);
2650
2651sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_;
2653
2654 $msg = $self->pl->expand_cfpod ($msg);
2655
2656 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657
2658 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2660
2661 if (ref $channel) {
2662 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667 }
2668
2669 $channel = $channel->{id};
2670 }
2671
2672 return unless @extra || length $msg;
2673
2674 if ($self->can_msg) {
2675 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF;
2678
2679 $self->send_packet ("msg " . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2681 } else {
2682 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones
2684 for ($msg) {
2685 1 while
2686 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2687 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2688 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2689 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2690 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2691 }
2692
2693 $color &= cf::NDI_COLOR_MASK;
2694
2695 utf8::encode $msg;
2696
2697 if (0 && $msg =~ /\[/) {
2698 # COMMAND/INFO
2699 $self->send_packet ("drawextinfo $color 10 8 $msg")
2700 } else {
2701 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2702 $self->send_packet ("drawinfo $color $msg")
2703 }
2704 }
2705 }
2706}
2707
2015=item $client->ext_event ($type, %msg) 2708=item $client->ext_msg ($type, @msg)
2016 2709
2017Sends an exti event to the client. 2710Sends an ext event to the client.
2018 2711
2019=cut 2712=cut
2020 2713
2021sub cf::client::ext_event($$%) { 2714sub cf::client::ext_msg($$@) {
2022 my ($self, $type, %msg) = @_; 2715 my ($self, $type, @msg) = @_;
2023 2716
2717 if ($self->extcmd == 2) {
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2719 } elsif ($self->extcmd == 1) { # TODO: remove
2024 $msg{msgtype} = "event_$type"; 2720 push @msg, msgtype => "event_$type";
2025 $self->send_packet ("ext " . cf::to_json \%msg); 2721 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2722 }
2723}
2724
2725=item $client->ext_reply ($msgid, @msg)
2726
2727Sends an ext reply to the client.
2728
2729=cut
2730
2731sub cf::client::ext_reply($$@) {
2732 my ($self, $id, @msg) = @_;
2733
2734 if ($self->extcmd == 2) {
2735 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2736 } elsif ($self->extcmd == 1) {
2737 #TODO: version 1, remove
2738 unshift @msg, msgtype => "reply", msgid => $id;
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2026} 2741}
2027 2742
2028=item $success = $client->query ($flags, "text", \&cb) 2743=item $success = $client->query ($flags, "text", \&cb)
2029 2744
2030Queues a query to the client, calling the given callback with 2745Queues a query to the client, calling the given callback with
2031the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2746the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2032C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2747C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2033 2748
2034Queries can fail, so check the return code. Or don't, as queries will become 2749Queries can fail, so check the return code. Or don't, as queries will
2035reliable at some point in the future. 2750become reliable at some point in the future.
2036 2751
2037=cut 2752=cut
2038 2753
2039sub cf::client::query { 2754sub cf::client::query {
2040 my ($self, $flags, $text, $cb) = @_; 2755 my ($self, $flags, $text, $cb) = @_;
2048 utf8::encode $text; 2763 utf8::encode $text;
2049 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2764 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2050 2765
2051 $self->send_packet ($self->{query_queue}[0][0]) 2766 $self->send_packet ($self->{query_queue}[0][0])
2052 if @{ $self->{query_queue} } == 1; 2767 if @{ $self->{query_queue} } == 1;
2768
2769 1
2053} 2770}
2054 2771
2055cf::client->attach ( 2772cf::client->attach (
2773 on_connect => sub {
2774 my ($ns) = @_;
2775
2776 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2777 },
2056 on_reply => sub { 2778 on_reply => sub {
2057 my ($ns, $msg) = @_; 2779 my ($ns, $msg) = @_;
2058 2780
2059 # this weird shuffling is so that direct followup queries 2781 # this weird shuffling is so that direct followup queries
2060 # get handled first 2782 # get handled first
2072 } else { 2794 } else {
2073 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2795 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2074 } 2796 }
2075 } 2797 }
2076 }, 2798 },
2799 on_exticmd => sub {
2800 my ($ns, $buf) = @_;
2801
2802 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2803
2804 if (ref $msg) {
2805 my ($type, $reply, @payload) =
2806 "ARRAY" eq ref $msg
2807 ? @$msg
2808 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2809
2810 my @reply;
2811
2812 if (my $cb = $EXTICMD{$type}) {
2813 @reply = $cb->($ns, @payload);
2814 }
2815
2816 $ns->ext_reply ($reply, @reply)
2817 if $reply;
2818
2819 } else {
2820 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2821 }
2822
2823 cf::override;
2824 },
2077); 2825);
2078 2826
2079=item $client->async (\&cb) 2827=item $client->async (\&cb)
2080 2828
2081Create a new coroutine, running the specified callback. The coroutine will 2829Create a new coroutine, running the specified callback. The coroutine will
2122our $safe = new Safe "safe"; 2870our $safe = new Safe "safe";
2123our $safe_hole = new Safe::Hole; 2871our $safe_hole = new Safe::Hole;
2124 2872
2125$SIG{FPE} = 'IGNORE'; 2873$SIG{FPE} = 'IGNORE';
2126 2874
2127$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2875$safe->permit_only (Opcode::opset qw(
2876 :base_core :base_mem :base_orig :base_math
2877 grepstart grepwhile mapstart mapwhile
2878 sort time
2879));
2128 2880
2129# here we export the classes and methods available to script code 2881# here we export the classes and methods available to script code
2130 2882
2131=pod 2883=pod
2132 2884
2133The following functions and methods are available within a safe environment: 2885The following functions and methods are available within a safe environment:
2134 2886
2135 cf::object contr pay_amount pay_player map 2887 cf::object
2888 contr pay_amount pay_player map x y force_find force_add
2889 insert remove name archname title slaying race decrease_ob_nr
2890
2136 cf::object::player player 2891 cf::object::player
2137 cf::player peaceful 2892 player
2138 cf::map trigger 2893
2894 cf::player
2895 peaceful
2896
2897 cf::map
2898 trigger
2139 2899
2140=cut 2900=cut
2141 2901
2142for ( 2902for (
2143 ["cf::object" => qw(contr pay_amount pay_player map)], 2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race
2905 decrease_ob_nr)],
2144 ["cf::object::player" => qw(player)], 2906 ["cf::object::player" => qw(player)],
2145 ["cf::player" => qw(peaceful)], 2907 ["cf::player" => qw(peaceful)],
2146 ["cf::map" => qw(trigger)], 2908 ["cf::map" => qw(trigger)],
2147) { 2909) {
2148 no strict 'refs'; 2910 no strict 'refs';
2219=back 2981=back
2220 2982
2221=cut 2983=cut
2222 2984
2223############################################################################# 2985#############################################################################
2224
2225=head2 EXTENSION DATABASE SUPPORT
2226
2227Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which
2229excludes objects.
2230
2231The parameter C<$family> should best start with the name of the extension
2232using it, it should be unique.
2233
2234=over 4
2235
2236=item $value = cf::db_get $family => $key
2237
2238Returns a single value from the database.
2239
2240=item cf::db_put $family => $key => $value
2241
2242Stores the given C<$value> in the family.
2243
2244=cut
2245
2246our $DB;
2247
2248sub db_init {
2249 unless ($DB) {
2250 $DB = BDB::db_create $DB_ENV;
2251
2252 cf::sync_job {
2253 eval {
2254 $DB->set_flags (BDB::CHKSUM);
2255
2256 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!;
2259 };
2260 cf::cleanup "db_open(db): $@" if $@;
2261 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 }
2277}
2278
2279sub db_get($$) {
2280 my $key = "$_[0]/$_[1]";
2281
2282 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data;
2284
2285 $! ? ()
2286 : Compress::LZF::sthaw $data
2287 }
2288}
2289
2290sub db_put($$$) {
2291 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2293}
2294
2295#############################################################################
2296# the server's init and main functions 2986# the server's init and main functions
2297 2987
2298sub load_facedata { 2988sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2989 my ($path) = @_;
2990
2991 # HACK to clear player env face cache, we need some signal framework
2992 # for this (global event?)
2993 %ext::player_env::MUSIC_FACE_CACHE = ();
2994
2995 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2300 2996
2301 warn "loading facedata from $path\n"; 2997 warn "loading facedata from $path\n";
2302 2998
2303 my $faces; 2999 my $facedata;
2304 0 < aio_load $path, $faces 3000 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 3001 or die "$path: $!";
2306 3002
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 3003 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 3004
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 3005 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 3006 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 3007
3008 # patch in the exptable
3009 $facedata->{resource}{"res/exp_table"} = {
3010 type => FT_RSRC,
3011 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3012 };
3013 cf::cede_to_tick;
3014
3015 {
3016 my $faces = $facedata->{faceinfo};
3017
2315 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3019 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3020 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2320 Coro::cede;
2321 }
2322 3024
3025 cf::cede_to_tick;
3026 }
3027
2323 while (my ($face, $info) = each %$faces) { 3028 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 3029 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 3030 my $idx = cf::face::find $face
2326 or next; 3031 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 3032 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 3033 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2329 } else { 3035 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3036 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 3037 }
2332 Coro::cede; 3038
3039 cf::cede_to_tick;
3040 }
3041 }
3042
3043 {
3044 my $anims = $facedata->{animinfo};
3045
3046 while (my ($anim, $info) = each %$anims) {
3047 cf::anim::set $anim, $info->{frames}, $info->{facings};
3048 cf::cede_to_tick;
3049 }
3050
3051 cf::anim::invalidate_all; # d'oh
3052 }
3053
3054 {
3055 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource};
3058
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data;
3064
3065 if ($info->{type} & 1) {
3066 # prepend meta info
3067
3068 my $meta = $enc->encode ({
3069 name => $name,
3070 %{ $info->{meta} || {} },
3071 });
3072
3073 $data = pack "(w/a*)*", $meta, $info->{data};
3074 } else {
3075 $data = $info->{data};
3076 }
3077
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick;
3082 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
2333 } 3101 }
2334 3102
2335 1 3103 1
2336} 3104}
2337 3105
3106register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_;
3108
3109 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v);
3111 }
3112};
3113
3114sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = ();
3118
3119 load_resource_file "$MAPDIR/regions"
3120 or die "unable to load regions file\n";
3121
3122 for (cf::region::list) {
3123 $_->{match} = qr/$_->{match}/
3124 if exists $_->{match};
3125 }
3126}
3127
3128sub reload_facedata {
3129 load_facedata "$DATADIR/facedata"
3130 or die "unable to load facedata\n";
3131}
3132
3133sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
3141}
3142
3143sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n";
3146}
3147
2338sub reload_resources { 3148sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3149 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 3150
3151 reload_regions;
2341 load_facedata 3152 reload_facedata;
2342 or die "unable to load facedata\n";#d# 3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures;
3156
3157 warn "finished reloading resource files\n";
2343} 3158}
2344 3159
2345sub init { 3160sub init {
2346 reload_resources; 3161 reload_resources;
2347} 3162}
2348 3163
2349sub cfg_load { 3164sub reload_config {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 3165 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 3166 or return;
2352 3167
2353 local $/; 3168 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 3169 *CFG = YAML::Syck::Load <$fh>;
2355 3170
2370sub main { 3185sub main {
2371 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
2372 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
2373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2374 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
2375 Event::one_event; 3191 Event::one_event;
2376 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
2377 }; 3193 };
2378 3194
2379 cfg_load; 3195 reload_config;
2380 db_init; 3196 db_init;
2381 load_extensions; 3197 load_extensions;
2382 3198
2383 $TICK_WATCHER->start; 3199 $TICK_WATCHER->start;
2384 Event::loop; 3200 Event::loop;
2400 }, 3216 },
2401 ); 3217 );
2402 } 3218 }
2403} 3219}
2404 3220
3221sub write_runtime {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time.
3226
3227 IO::AIO::aio_utime $runtime, undef, undef;
3228
3229 my $guard = cf::lock_acquire "write_runtime";
3230
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3232 or return;
3233
3234 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server.
3237
3238 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3239 and return;
3240
3241 # always fsync - this file is important
3242 aio_fsync $fh
3243 and return;
3244
3245 # touch it again to show we are up-to-date
3246 aio_utime $fh, undef, undef;
3247
3248 close $fh
3249 or return;
3250
3251 aio_rename "$runtime~", $runtime
3252 and return;
3253
3254 warn "runtime file written.\n";
3255
3256 1
3257}
3258
2405sub emergency_save() { 3259sub emergency_save() {
2406 my $freeze_guard = cf::freeze_mainloop; 3260 my $freeze_guard = cf::freeze_mainloop;
2407 3261
2408 warn "enter emergency perl save\n"; 3262 warn "enter emergency perl save\n";
2409 3263
2440 3294
2441 warn Carp::longmess "post_cleanup backtrace" 3295 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 3296 if $make_core;
2443} 3297}
2444 3298
2445sub reload() { 3299sub do_reload_perl() {
2446 # can/must only be called in main 3300 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 3301 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 3302 warn "can only reload from main coroutine";
2449 return; 3303 return;
2450 } 3304 }
2484 %EXT_CORO = (); 3338 %EXT_CORO = ();
2485 3339
2486 warn "removing commands"; 3340 warn "removing commands";
2487 %COMMAND = (); 3341 %COMMAND = ();
2488 3342
2489 warn "removing ext commands"; 3343 warn "removing ext/exti commands";
2490 %EXTCMD = (); 3344 %EXTCMD = ();
3345 %EXTICMD = ();
2491 3346
2492 warn "unloading/nuking all extensions"; 3347 warn "unloading/nuking all extensions";
2493 for my $pkg (@EXTS) { 3348 for my $pkg (@EXTS) {
2494 warn "... unloading $pkg"; 3349 warn "... unloading $pkg";
2495 3350
2525 Symbol::delete_package "safe::$_" 3380 Symbol::delete_package "safe::$_"
2526 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3381 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2527 3382
2528 warn "unloading cf.pm \"a bit\""; 3383 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 3384 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"};
2530 3386
2531 # don't, removes xs symbols, too, 3387 # don't, removes xs symbols, too,
2532 # and global variables created in xs 3388 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 3389 #Symbol::delete_package __PACKAGE__;
2534 3390
2537 warn "reloading cf.pm"; 3393 warn "reloading cf.pm";
2538 require cf; 3394 require cf;
2539 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2540 3396
2541 warn "loading config and database again"; 3397 warn "loading config and database again";
2542 cf::cfg_load; 3398 cf::reload_config;
2543 3399
2544 warn "loading extensions"; 3400 warn "loading extensions";
2545 cf::load_extensions; 3401 cf::load_extensions;
2546 3402
2547 warn "reattaching attachments to objects/players"; 3403 warn "reattaching attachments to objects/players";
2549 warn "reattaching attachments to maps"; 3405 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 3406 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 3407 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 3408 reattach $_ for values %PLAYER;
2553 3409
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 3410 warn "leaving sync_job";
2558 3411
2559 1 3412 1
2560 } or do { 3413 } or do {
2561 warn $@; 3414 warn $@;
2566 warn "reloaded"; 3419 warn "reloaded";
2567}; 3420};
2568 3421
2569our $RELOAD_WATCHER; # used only during reload 3422our $RELOAD_WATCHER; # used only during reload
2570 3423
3424sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here.
3427
3428 $RELOAD_WATCHER ||= Event->timer (
3429 reentrant => 0,
3430 after => 0,
3431 data => WF_AUTOCANCEL,
3432 cb => sub {
3433 do_reload_perl;
3434 undef $RELOAD_WATCHER;
3435 },
3436 );
3437}
3438
2571register_command "reload" => sub { 3439register_command "reload" => sub {
2572 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
2573 3441
2574 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
2576 3444 async {
2577 # doing reload synchronously and two reloads happen back-to-back, 3445 $Coro::current->{desc} = "perl_reload";
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload; 3446 reload_perl;
2586 undef $RELOAD_WATCHER;
2587 },
2588 ); 3447 };
2589 } 3448 }
2590}; 3449};
2591 3450
2592unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
2593 3452
2594my $bug_warning = 0; 3453my $bug_warning = 0;
3454
3455our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN;
3457
3458sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main;
3461
3462 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait;
3465}
3466
3467sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main;
3470
3471 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait;
3474}
2595 3475
2596$TICK_WATCHER = Event->timer ( 3476$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 3477 reentrant => 0,
2598 parked => 1, 3478 parked => 1,
2599 prio => 0, 3479 prio => 0,
2604 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3484 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2605 unless ++$bug_warning > 10; 3485 unless ++$bug_warning > 10;
2606 return; 3486 return;
2607 } 3487 }
2608 3488
2609 $NOW = Event::time; 3489 $NOW = $tick_start = Event::time;
2610 3490
2611 cf::server_tick; # one server iteration 3491 cf::server_tick; # one server iteration
3492
2612 $RUNTIME += $TICK; 3493 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
2614 3495
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
2617 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
2618 write_runtime 3500 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
2620 }; 3502 };
2621 } 3503 }
2622 3504
2623 $WAIT_FOR_TICK->broadcast; 3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3506 $sig->send;
3507 }
3508 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send;
3510 }
2625 3511
2626# my $AFTER = Event::time; 3512 $NOW = Event::time;
2627# warn $AFTER - $NOW;#d#
2628 3513
2629 # if we are delayed by four ticks or more, skip them all 3514 # if we are delayed by four ticks or more, skip them all
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 3516
2632 $TICK_WATCHER->at ($NEXT_TICK); 3517 $TICK_WATCHER->at ($NEXT_TICK);
2633 $TICK_WATCHER->start; 3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522
3523 _post_tick;
2634 }, 3524 },
2635); 3525);
2636 3526
2637{ 3527{
3528 BDB::min_parallel 8;
2638 BDB::max_poll_time $TICK * 0.1; 3529 BDB::max_poll_time $TICK * 0.1;
2639 $BDB_POLL_WATCHER = Event->io ( 3530 $BDB_POLL_WATCHER = Event->io (
2640 reentrant => 0, 3531 reentrant => 0,
2641 fd => BDB::poll_fileno, 3532 fd => BDB::poll_fileno,
2642 poll => 'r', 3533 poll => 'r',
2643 prio => 0, 3534 prio => 0,
2644 data => WF_AUTOCANCEL, 3535 data => WF_AUTOCANCEL,
2645 cb => \&BDB::poll_cb, 3536 cb => \&BDB::poll_cb,
2646 ); 3537 );
2647 BDB::min_parallel 8;
2648 3538
2649 BDB::set_sync_prepare { 3539 BDB::set_sync_prepare {
2650 my $status; 3540 my $status;
2651 my $current = $Coro::current; 3541 my $current = $Coro::current;
2652 ( 3542 (
2661 ) 3551 )
2662 }; 3552 };
2663 3553
2664 unless ($DB_ENV) { 3554 unless ($DB_ENV) {
2665 $DB_ENV = BDB::db_env_create; 3555 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3557 | BDB::LOG_AUTOREMOVE, 1);
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2666 3560
2667 cf::sync_job { 3561 cf::sync_job {
2668 eval { 3562 eval {
2669 BDB::db_env_open 3563 BDB::db_env_open
2670 $DB_ENV, 3564 $DB_ENV,
2671 $BDB_ENV_DIR, 3565 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 3568 0666;
2675 3569
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect;
2680 }; 3571 };
2681 3572
2682 cf::cleanup "db_env_open(db): $@" if $@; 3573 cf::cleanup "db_env_open(db): $@" if $@;
2683 }; 3574 };
2684 } 3575 }
3576
3577 $BDB_DEADLOCK_WATCHER = Event->timer (
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 );
3587 $BDB_CHECKPOINT_WATCHER = Event->timer (
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 );
3597 $BDB_TRICKLE_WATCHER = Event->timer (
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 );
2685} 3607}
2686 3608
2687{ 3609{
2688 IO::AIO::min_parallel 8; 3610 IO::AIO::min_parallel 8;
2689 3611
2697 prio => 6, 3619 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 3620 cb => \&IO::AIO::poll_cb,
2699 ); 3621 );
2700} 3622}
2701 3623
3624my $_log_backtrace;
3625
3626sub _log_backtrace {
3627 my ($msg, @addr) = @_;
3628
3629 $msg =~ s/\n//;
3630
3631 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace;
3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
3637 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr;
3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3641 or die "addr2line: $!";
3642
3643 my @funcs;
3644 my @res = <$fh>;
3645 chomp for @res;
3646 while (@res) {
3647 my ($func, $line) = splice @res, 0, 2, ();
3648 push @funcs, "[$func] $line";
3649 }
3650
3651 @funcs
3652 };
3653
3654 LOG llevInfo, "[ABT] $msg\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace;
3657 };
3658 } else {
3659 LOG llevInfo, "[ABT] $msg\n";
3660 LOG llevInfo, "[ABT] [suppressed]\n";
3661 }
3662}
3663
3664# load additional modules
3665use cf::pod;
3666
2702END { cf::emergency_save } 3667END { cf::emergency_save }
2703 3668
27041 36691
2705 3670

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines