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.184 by root, Fri Jan 19 22:47:57 2007 UTC vs.
Revision 1.348 by root, Thu Aug 30 08:34:40 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $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
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $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(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 80our $NEXT_TICK;
52our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
53 86
54our %CFG; 87our %CFG;
55 88
56our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 90our $RUNTIME;
58 91
59our %PLAYER; # all users 92our %PLAYER; # all users
60our %MAP; # all maps 93our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 95
67# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
70binmode STDOUT; 103binmode STDOUT;
71binmode STDERR; 104binmode STDERR;
72 105
73# read virtual server time, if available 106# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
78} 111}
79 112
80mkdir cf::localdir; 113mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 115
86our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
87 119
88############################################################################# 120#############################################################################
89 121
90=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
91 123
98=item $cf::RUNTIME 130=item $cf::RUNTIME
99 131
100The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 133every server tick.
102 134
103=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 138
105The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
107 143
108=item $cf::NOW 144=item $cf::NOW
109 145
110The time of the last (current) server tick. 146The time of the last (current) server tick.
111 147
112=item $cf::TICK 148=item $cf::TICK
113 149
114The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
115 161
116=item %cf::CFG 162=item %cf::CFG
117 163
118Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 165from wherever your confdir points to.
120 166
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
122 168
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
127 178
128=back 179=back
129 180
130=cut 181=cut
131 182
132BEGIN { 183BEGIN {
133 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 185 my $msg = join "", @_;
135 utf8::encode $msg;
136 186
137 $msg .= "\n" 187 $msg .= "\n"
138 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
139 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
140 LOG llevError, $msg; 193 LOG llevError, $msg;
141 }; 194 };
142} 195}
143 196
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 204
151# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 206# within the Safe compartment.
153for my $pkg (qw( 207for my $pkg (qw(
154 cf::global cf::attachable 208 cf::global cf::attachable
162} 216}
163 217
164$Event::DIED = sub { 218$Event::DIED = sub {
165 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
166}; 220};
221
222#############################################################################
167 223
168=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
169 225
170=over 4 226=over 4
171 227
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 247 $d
192 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
193} 249}
194 250
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
198 252
199Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
200 254
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
209 256
210Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
211 258
212=cut 259=cut
213 260
214sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
216 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
217} 264sub from_json ($) { $json_coder->decode ($_[0]) }
218 265
219=item cf::lock_wait $string 266=item cf::lock_wait $string
220 267
221Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
222 269
225Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
226a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
227for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
228returned. 275returned.
229 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
230Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
232 286
233=cut 287=cut
234 288
235our %LOCK; 289our %LOCK;
236 290
256 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
258 } 312 }
259} 313}
260 314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
319}
320
261sub freeze_mainloop { 321sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
263 323
264 my $guard = Coro::guard { 324 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 326 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
270 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
271} 385}
272 386
273=item cf::async { BLOCK } 387=item cf::async { BLOCK }
274 388
275Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
280 394
281BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
282 396
283=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
284 398
285The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
288 403
289If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
292fast or be very important. 407fast or be very important.
295 410
296sub sync_job(&) { 411sub sync_job(&) {
297 my ($job) = @_; 412 my ($job) = @_;
298 413
299 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
300 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
302 419
303 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 421 # (but this is cancel-safe)
315 432
316 while ($busy) { 433 while ($busy) {
317 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
318 } 435 }
319 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
320 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
321 } else { 445 } else {
322 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
323 447
324 $job->() 448 $job->()
343 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
344 468
345 $coro 469 $coro
346} 470}
347 471
348sub write_runtime { 472=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 473
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 474Executes the given code block with the given arguments in a seperate
352 or return; 475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
353 478
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 479=cut
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return;
357 480
358 aio_fsync $fh 481sub fork_call(&@) {
359 and return; 482 my ($cb, @args) = @_;
360 483
361 close $fh 484 # we seemingly have to make a local copy of the whole thing,
362 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
363 487
364 aio_rename "$runtime~", $runtime 488 my @res = Coro::Util::fork_eval {
365 and return; 489 reset_signals;
490 &$cb
491 }, @args;
366 492
493 wantarray ? @res : $res[-1]
494}
495
496=item $value = cf::db_get $family => $key
497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
367 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 621}
369 622
370=back 623=back
371 624
372=cut 625=cut
379attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
380to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
381 634
382In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
383C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
384crossfire+). 637Crossfire TRT).
385 638
386=over 4 639=over 4
387 640
388=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
389 642
552 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
553 806
554 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
555 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
556 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
557 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
558 811
559 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
560 my $pkg = shift @arg; 813 my $pkg = shift @arg;
561 814
562 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
591 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
592 } 845 }
593 846
594 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
595 } else { 848 } else {
596 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
597 } 850 }
598 851
599 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
600} 853}
601 854
603 if (ref $_[0]) { 856 if (ref $_[0]) {
604 _object_attach @_; 857 _object_attach @_;
605 } else { 858 } else {
606 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
607 } 860 }
861 _recalc_want;
608}; 862};
609 863
610# all those should be optimised 864# all those should be optimised
611sub cf::attachable::detach { 865sub cf::attachable::detach {
612 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
615 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
616 reattach ($obj); 870 reattach ($obj);
617 } else { 871 } else {
618 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
619 } 873 }
874 _recalc_want;
620}; 875};
621 876
622sub cf::attachable::attached { 877sub cf::attachable::attached {
623 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
624 879
639 "; 894 ";
640 die if $@; 895 die if $@;
641} 896}
642 897
643our $override; 898our $override;
644our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
645 900
646sub override { 901sub override {
647 $override = 1; 902 $override = 1;
648 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
649} 904}
650 905
651sub do_invoke { 906sub do_invoke {
652 my $event = shift; 907 my $event = shift;
653 my $callbacks = shift; 908 my $callbacks = shift;
654 909
655 @invoke_results = (); 910 @INVOKE_RESULTS = ();
656 911
657 local $override; 912 local $override;
658 913
659 for (@$callbacks) { 914 for (@$callbacks) {
660 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
677 932
678Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
679 934
680This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
681removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
682results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
683 938
684=back 939=back
685 940
686=cut 941=cut
687 942
688############################################################################# 943#############################################################################
689# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
690 956
691sub reattach { 957sub reattach {
692 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
693 my ($obj) = @_; 959 my ($obj) = @_;
694 960
747 $filename, length $$rdata, scalar @$objs; 1013 $filename, length $$rdata, scalar @$objs;
748 1014
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 1016 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 1018 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 1019 close $fh;
754 1020
755 if (@$objs) { 1021 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 1023 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1024 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 1025 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 1026 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 1027 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 1028 aio_rename "$filename.pst~", "$filename.pst";
763 } 1029 }
764 } else { 1030 } else {
765 aio_unlink "$filename.pst"; 1031 aio_unlink "$filename.pst";
797 or return; 1063 or return;
798 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
799 } 1065 }
800 1066
801 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
802 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
803 return ($data, $av); 1069 return ($data, $av);
804} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
805 1077
806############################################################################# 1078#############################################################################
807# command handling &c 1079# command handling &c
808 1080
809=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
822 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
823} 1095}
824 1096
825=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
826 1098
827Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
828 1104
829If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
830called. 1106called.
831 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
832=cut 1119=cut
833 1120
834sub register_extcmd { 1121sub register_extcmd {
835 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
836 1123
837 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
838} 1131}
839 1132
840cf::player->attach ( 1133cf::player->attach (
841 on_command => sub { 1134 on_command => sub {
842 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
851 cf::override; 1144 cf::override;
852 }, 1145 },
853 on_extcmd => sub { 1146 on_extcmd => sub {
854 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
855 1148
856 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
857 1150
858 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
859 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
860 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
861 $pl->ext_reply ($msg->{msgid}, %reply);
862 }
863 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
864 } else { 1166 } else {
865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
866 } 1168 }
867 1169
868 cf::override; 1170 cf::override;
869 }, 1171 },
870); 1172);
871 1173
872sub load_extension {
873 my ($path) = @_;
874
875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
876 my $base = $1;
877 my $pkg = $1;
878 $pkg =~ s/[^[:word:]]/_/g;
879 $pkg = "ext::$pkg";
880
881 warn "... loading '$path' into '$pkg'\n";
882
883 open my $fh, "<:utf8", $path
884 or die "$path: $!";
885
886 my $source =
887 "package $pkg; use strict; use utf8;\n"
888 . "#line 1 \"$path\"\n{\n"
889 . (do { local $/; <$fh> })
890 . "\n};\n1";
891
892 unless (eval $source) {
893 my $msg = $@ ? "$path: $@\n"
894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
902
903 push @EXTS, $pkg;
904}
905
906sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
907 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
908 next unless -r $ext; 1179 next unless -r $path;
909 eval { 1180
910 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
911 1 1238 }
912 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
913 } 1244 };
914} 1245}
915 1246
916############################################################################# 1247#############################################################################
917 1248
1249=back
1250
918=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
919 1252
920Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
921 1254
922=cut 1255=cut
934Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
935 1268
936=cut 1269=cut
937 1270
938sub playerdir($) { 1271sub playerdir($) {
939 cf::localdir 1272 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 1274}
945 1275
946sub path($) { 1276sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 1278
949 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
950} 1280}
951 1281
952sub find_active($) { 1282sub find_active($) {
953 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
967 my $login = $_[0]; 1297 my $login = $_[0];
968 1298
969 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
970 1300
971 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
972 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
973 or return; 1310 or return;
974 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
975 } 1312 }
976 } 1313 }
988 1325
989 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
990 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
991 1328
992 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
993 Coro::cede; 1330 cf::cede_to_tick;
994} 1331}
995 1332
996sub new($) { 1333sub new($) {
997 my ($login) = @_; 1334 my ($login) = @_;
998 1335
1004 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1005 1342
1006 $self 1343 $self
1007} 1344}
1008 1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1354}
1355
1009=item $pl->quit_character 1356=item $pl->quit_character
1010 1357
1011Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1012be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1013 1360
1014=cut 1361=cut
1015 1362
1016sub quit_character { 1363sub quit_character {
1017 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1018 1367
1019 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1369 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1370
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1380 $pl->destroy;
1381
1382 my $prefix = qr<^~\Q$name\E/>;
1383
1384 # nuke player maps
1385 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1386
1032 IO::AIO::aio_rmtree $temp; 1387 IO::AIO::aio_rmtree $temp;
1388}
1389
1390=item $pl->kick
1391
1392Kicks a player out of the game. This destroys the connection.
1393
1394=cut
1395
1396sub kick {
1397 my ($pl, $kicker) = @_;
1398
1399 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1400 $pl->killer ("kicked");
1401 $pl->ns->destroy;
1033} 1402}
1034 1403
1035=item cf::player::list_logins 1404=item cf::player::list_logins
1036 1405
1037Returns am arrayref of all valid playernames in the system, can take a 1406Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1039 1408
1040=cut 1409=cut
1041 1410
1042sub list_logins { 1411sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1413 or return [];
1045 1414
1046 my @logins; 1415 my @logins;
1047 1416
1048 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1065=cut 1434=cut
1066 1435
1067sub maps($) { 1436sub maps($) {
1068 my ($pl) = @_; 1437 my ($pl) = @_;
1069 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1070 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1071 or return; 1442 or return;
1072 1443
1073 my @paths; 1444 my @paths;
1074 1445
1075 for (@$files) { 1446 for (@$files) {
1076 utf8::decode $_; 1447 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1079 1450
1080 s/\.map$//; 1451 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1452 }
1083 1453
1084 \@paths 1454 \@paths
1085} 1455}
1086 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1088 1508
1089Sends an ext reply to the player. 1509Sends an ext reply to the player.
1090 1510
1091=cut 1511=cut
1092 1512
1093sub ext_reply($$$%) { 1513sub ext_reply($$@) {
1094 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1095 1515
1096 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1097
1098 $self->send ("ext " . cf::to_json \%msg);
1099} 1517}
1100 1518
1101package cf; 1519=item $player->ext_msg ($type, @msg)
1520
1521Sends an ext event to the client.
1522
1523=cut
1524
1525sub ext_msg($$@) {
1526 my ($self, $type, @msg) = @_;
1527
1528 $self->ns->ext_msg ($type, @msg);
1529}
1530
1531=head3 cf::region
1532
1533=over 4
1534
1535=cut
1536
1537package cf::region;
1538
1539=item cf::region::find_by_path $path
1540
1541Tries to decuce the likely region for a map knowing only its path.
1542
1543=cut
1544
1545sub find_by_path($) {
1546 my ($path) = @_;
1547
1548 my ($match, $specificity);
1549
1550 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) {
1552 ($match, $specificity) = ($region, $region->specificity)
1553 if $region->specificity > $specificity;
1554 }
1555 }
1556
1557 $match
1558}
1102 1559
1103=back 1560=back
1104
1105 1561
1106=head3 cf::map 1562=head3 cf::map
1107 1563
1108=over 4 1564=over 4
1109 1565
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1595 )
1140} 1596}
1141 1597
1598=item cf::map->register ($regex, $prio)
1599
1600Register a handler for the map path matching the given regex at the
1601givne priority (higher is better, built-in handlers have priority 0, the
1602default).
1603
1604=cut
1605
1142sub register { 1606sub register {
1143 my (undef, $regex) = @_; 1607 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1608 my $pkg = caller;
1145 1609
1146 no strict; 1610 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1611 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1612
1149 $EXT_MAP{$pkg} = qr<$regex>; 1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1614}
1151 1615
1152# also paths starting with '/' 1616# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1618
1155sub thawer_merge { 1619sub thawer_merge {
1156 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1157 1621
1158 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1159 local $self->{path}; 1623 local $self->{path};
1160 local $self->{load_path}; 1624 local $self->{load_path};
1161 local $self->{deny_save};
1162 local $self->{deny_reset};
1163 1625
1164 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1165} 1627}
1166 1628
1167sub normalise { 1629sub normalise {
1168 my ($path, $base) = @_; 1630 my ($path, $base) = @_;
1631
1632 $path = "$path"; # make sure its a string
1633
1634 $path =~ s/\.map$//;
1169 1635
1170 # map plan: 1636 # map plan:
1171 # 1637 #
1172 # /! non-realised random map exit (special hack!) 1638 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1639 # {... are special paths that are not being touched
1201 1667
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1668 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1669
1204 $path = normalise $path, $base; 1670 $path = normalise $path, $base;
1205 1671
1206 for my $pkg (keys %EXT_MAP) { 1672 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1673 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1674 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1675 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1211 return $self; 1677 return $self;
1212 } 1678 }
1213 } 1679 }
1214 1680
1215 Carp::carp "unable to resolve path '$path'."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1216 () 1682 ()
1217} 1683}
1218 1684
1219sub init { 1685sub init {
1220 my ($self) = @_; 1686 my ($self) = @_;
1235 1701
1236# the original (read-only) location 1702# the original (read-only) location
1237sub load_path { 1703sub load_path {
1238 my ($self) = @_; 1704 my ($self) = @_;
1239 1705
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1241} 1707}
1242 1708
1243# the temporary/swap location 1709# the temporary/swap location
1244sub save_path { 1710sub save_path {
1245 my ($self) = @_; 1711 my ($self) = @_;
1246 1712
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1249} 1715}
1250 1716
1251# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1252sub uniq_path { 1718sub uniq_path {
1253 my ($self) = @_; 1719 my ($self) = @_;
1254 1720
1255 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1256 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1257} 1723}
1258 1724
1259# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1260# all maps in C++... 1726# all maps in C++...
1261sub change_all_map_light { 1727sub change_all_map_light {
1263 1729
1264 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1265 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1266} 1732}
1267 1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1740}
1741
1268sub unlink_save { 1742sub unlink_save {
1269 my ($self) = @_; 1743 my ($self) = @_;
1270 1744
1271 utf8::encode (my $save = $self->save_path); 1745 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1746 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1275 1749
1276sub load_header_from($) { 1750sub load_header_from($) {
1277 my ($self, $path) = @_; 1751 my ($self, $path) = @_;
1278 1752
1279 utf8::encode $path; 1753 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1754 #aio_open $path, O_RDONLY, 0
1281 or return; 1755 # or return;
1282 1756
1283 $self->_load_header ($path) 1757 $self->_load_header ($path)
1284 or return; 1758 or return;
1285 1759
1286 $self->{load_path} = $path; 1760 $self->{load_path} = $path;
1287 1761
1288 1 1762 1
1289} 1763}
1290 1764
1291sub load_orig { 1765sub load_header_orig {
1292 my ($self) = @_; 1766 my ($self) = @_;
1293 1767
1294 $self->load_header_from ($self->load_path) 1768 $self->load_header_from ($self->load_path)
1295} 1769}
1296 1770
1297sub load_temp { 1771sub load_header_temp {
1298 my ($self) = @_; 1772 my ($self) = @_;
1299 1773
1300 $self->load_header_from ($self->save_path) 1774 $self->load_header_from ($self->save_path)
1775}
1776
1777sub prepare_temp {
1778 my ($self) = @_;
1779
1780 $self->last_access ((delete $self->{last_access})
1781 || $cf::RUNTIME); #d#
1782 # safety
1783 $self->{instantiate_time} = $cf::RUNTIME
1784 if $self->{instantiate_time} > $cf::RUNTIME;
1785}
1786
1787sub prepare_orig {
1788 my ($self) = @_;
1789
1790 $self->{load_original} = 1;
1791 $self->{instantiate_time} = $cf::RUNTIME;
1792 $self->last_access ($cf::RUNTIME);
1793 $self->instantiate;
1301} 1794}
1302 1795
1303sub load_header { 1796sub load_header {
1304 my ($self) = @_; 1797 my ($self) = @_;
1305 1798
1306 if ($self->load_temp) { 1799 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1800 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1801 } else {
1313 $self->load_orig 1802 $self->load_header_orig
1314 or return; 1803 or return;
1315 1804 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1805 }
1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1810 $self->default_region (cf::region::find_by_path $self->{path})
1811 unless $self->default_region;
1321 1812
1322 1 1813 1
1323} 1814}
1324 1815
1325sub find; 1816sub find;
1338 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1339 1830
1340 $map->load_header 1831 $map->load_header
1341 or return; 1832 or return;
1342 1833
1343 if ($map->should_reset) { 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1837 $map->reset;
1346 undef $guard; 1838 undef $guard;
1347 $map = find $path 1839 return find $path;
1348 or return;
1349 } 1840 }
1350 1841
1351 $cf::MAP{$path} = $map 1842 $cf::MAP{$path} = $map
1352 } 1843 }
1353} 1844}
1845
1846sub pre_load { }
1847sub post_load { }
1354 1848
1355sub load { 1849sub load {
1356 my ($self) = @_; 1850 my ($self) = @_;
1357 1851
1852 local $self->{deny_reset} = 1; # loading can take a long time
1853
1358 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1359 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1360 1859
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1861
1363 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1364 1863
1365 $self->alloc; 1864 $self->alloc;
1865
1866 $self->pre_load;
1867 cf::cede_to_tick;
1868
1366 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1870 or return;
1368 1871
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1371 1874
1372 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1373 utf8::encode $uniq; 1876 utf8::encode $uniq;
1374 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1375 $self->clear_unique_items; 1878 $self->clear_unique_items;
1376 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1377 } 1880 }
1378 } 1881 }
1379 1882
1380 Coro::cede; 1883 cf::cede_to_tick;
1381
1382 # now do the right thing for maps 1884 # now do the right thing for maps
1383 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1384
1385 unless ($self->{deny_activate}) {
1386 $self->decay_objects;
1387 $self->fix_auto_apply;
1388 $self->update_buttons;
1389 Coro::cede;
1390 $self->set_darkness_map;
1391 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1392 unless $self->difficulty; 1887 unless $self->difficulty;
1393 Coro::cede; 1888 cf::cede_to_tick;
1889
1890 unless ($self->{deny_activate}) {
1891 $self->decay_objects;
1892 $self->fix_auto_apply;
1893 $self->update_buttons;
1894 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1394 $self->activate; 1897 $self->activate;
1395 } 1898 }
1396 1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1904 }
1905
1906 $self->post_load;
1398} 1907}
1399 1908
1400sub customise_for { 1909sub customise_for {
1401 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1402 1911
1403 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1404 if $self->per_player; 1913 if $self->per_player;
1405 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1406 $self 1918 $self
1407} 1919}
1408 1920
1409# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1410sub load_diag { 1922sub load_neighbours {
1411 my ($map) = @_; 1923 my ($map) = @_;
1412 1924
1413 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1414 1926
1415 for (0 .. 3) { 1927 for (0 .. 3) {
1416 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1417 or next; 1929 or next;
1418 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1419 or next; 1931 or next;
1420 $neigh->load; 1932 $neigh->load;
1421 1933
1934 push @neigh,
1422 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1423 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1424 } 1937 }
1425 1938
1426 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1427 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1428 or next; 1942 or next;
1429 $neigh->load; 1943 $neigh->load;
1430 } 1944 }
1431} 1945}
1432 1946
1437} 1951}
1438 1952
1439sub do_load_sync { 1953sub do_load_sync {
1440 my ($map) = @_; 1954 my ($map) = @_;
1441 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1442 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1443} 1960}
1444 1961
1445our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1447 1964
1448sub find_async { 1965sub find_async {
1449 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1450 1967
1451 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1452 1969
1453 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1454 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1455 } 1972 }
1456 1973
1457 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1458 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1461 my $map = find $path 1979 if (my $map = find $k) {
1462 or next;
1463 $map->load; 1980 $map->load if $v;
1981 }
1464 1982
1465 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1466 } 1984 }
1467 } 1985 }
1468 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1469 }; 1987 };
1988 $MAP_PREFETCHER->prio (6);
1470 1989
1471 () 1990 ()
1472} 1991}
1473 1992
1474sub save { 1993sub save {
1475 my ($self) = @_; 1994 my ($self) = @_;
1476 1995
1477 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1478 1997
1479 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1480 1999
1481 return unless $self->dirty; 2000 return unless $self->dirty;
1482 2001
1505 my ($self) = @_; 2024 my ($self) = @_;
1506 2025
1507 # save first because save cedes 2026 # save first because save cedes
1508 $self->save; 2027 $self->save;
1509 2028
1510 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1511 2030
1512 return if $self->players; 2031 return if $self->players;
1513 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1514 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1515 2034
1519 2038
1520sub reset_at { 2039sub reset_at {
1521 my ($self) = @_; 2040 my ($self) = @_;
1522 2041
1523 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1524 return 1e99 if $self->isa ("ext::map_per_player");#d#
1525 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1526 2044
1527 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1528 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2046 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1529 2047
1540 my ($self) = @_; 2058 my ($self) = @_;
1541 2059
1542 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1543 2061
1544 return if $self->players; 2062 return if $self->players;
1545 return if $self->isa ("ext::map_per_player");#d#
1546 2063
1547 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
2065
2066 $self->in_memory (cf::MAP_SWAPPED);
2067
2068 # need to save uniques path
2069 unless ($self->{deny_save}) {
2070 my $uniq = $self->uniq_path; utf8::encode $uniq;
2071
2072 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2073 if $uniq;
2074 }
1548 2075
1549 delete $cf::MAP{$self->path}; 2076 delete $cf::MAP{$self->path};
1550 2077
1551 $self->in_memory (cf::MAP_SWAPPED);
1552 $self->clear; 2078 $self->clear;
1553 2079
1554 $_->clear_links_to ($self) for values %cf::MAP; 2080 $_->clear_links_to ($self) for values %cf::MAP;
1555 2081
1556 $self->unlink_save; 2082 $self->unlink_save;
1575 $cf::MAP{$self->path} = $self; 2101 $cf::MAP{$self->path} = $self;
1576 2102
1577 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
1578} 2104}
1579 2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
2140}
2141
1580=item cf::map::unique_maps 2142=item cf::map::unique_maps
1581 2143
1582Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1583instantiated unique items. May block. 2145instantiated unique items. May block.
1584 2146
1585=cut 2147=cut
1586 2148
1587sub unique_maps() { 2149sub unique_maps() {
1588 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2150 [
1589 or return; 2151 map {
1590
1591 my @paths;
1592
1593 for (@$files) {
1594 utf8::decode $_; 2152 utf8::decode $_;
1595 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o;
1597
1598 s/\.map$//; 2153 /\.map$/
1599 push @paths, $_; 2154 ? normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] }
1600 } 2157 ]
1601
1602 \@paths
1603} 2158}
1604 2159
1605package cf; 2160package cf;
1606 2161
1607=back 2162=back
1653 2208
1654 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1655 2210
1656 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1657 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1658 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220
2221 } else {
1659 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
1660 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2224 }
1661 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
1662} 2236}
1663 2237
1664=item $player_object->may ("access") 2238=item $player_object->may ("access")
1665 2239
1666Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
1698=cut 2272=cut
1699 2273
1700sub link_map { 2274sub link_map {
1701 unless ($LINK_MAP) { 2275 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 2276 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2277 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 2278 $LINK_MAP->load;
1705 } 2279 }
1706 2280
1707 $LINK_MAP 2281 $LINK_MAP
1708} 2282}
1713 $self->deactivate_recursive; 2287 $self->deactivate_recursive;
1714 2288
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2289 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 2290
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 2292 if $self->map && $self->map->{path} ne "{link}";
1719 2293
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2294 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 2295}
1722 2296
1723sub cf::object::player::leave_link { 2297sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 2298 my ($self, $map, $x, $y) = @_;
2299
2300 return unless $self->contr->active;
1725 2301
1726 my $link_pos = delete $self->{_link_pos}; 2302 my $link_pos = delete $self->{_link_pos};
1727 2303
1728 unless ($map) { 2304 unless ($map) {
1729 # restore original map position 2305 # restore original map position
1743 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
1744 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
1745 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
1746 2322
1747 $map->load; 2323 $map->load;
1748 $map->load_diag; 2324 $map->load_neighbours;
1749 2325
1750 return unless $self->contr->active; 2326 return unless $self->contr->active;
1751 $self->activate_recursive; 2327 $self->activate_recursive;
2328
2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1752 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
1753} 2331}
1754 2332
1755cf::player->attach ( 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1756 on_logout => sub {
1757 my ($pl) = @_;
1758 2334
1759 # abort map switching before logout 2335Moves the player to the given map-path and coordinates by first freezing
1760 if ($pl->ob->{_link_pos}) { 2336her, loading and preparing them map, calling the provided $check callback
1761 cf::sync_job { 2337that has to return the map if sucecssful, and then unfreezes the player on
1762 $pl->ob->leave_link 2338the new (success) or old (failed) map position. In either case, $done will
1763 }; 2339be called at the end of this process.
1764 }
1765 },
1766 on_login => sub {
1767 my ($pl) = @_;
1768 2340
1769 # try to abort aborted map switching on player login :)
1770 # should happen only on crashes
1771 if ($pl->ob->{_link_pos}) {
1772 $pl->ob->enter_link;
1773 (async {
1774 # we need this sleep as the login has a concurrent enter_exit running
1775 # and this sleep increases chances of the player not ending up in scorn
1776 $pl->ob->reply (undef,
1777 "There was an internal problem at your last logout, "
1778 . "the server will try to bring you to your intended destination in a second.",
1779 cf::NDI_RED);
1780 Coro::Timer::sleep 1;
1781 $pl->ob->leave_link;
1782 })->prio (2);
1783 }
1784 },
1785);
1786
1787=item $player_object->goto ($path, $x, $y)
1788
1789=cut 2341=cut
2342
2343our $GOTOGEN;
1790 2344
1791sub cf::object::player::goto { 2345sub cf::object::player::goto {
1792 my ($self, $path, $x, $y) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2347
2348 # do generation counting so two concurrent goto's will be executed in-order
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1793 2350
1794 $self->enter_link; 2351 $self->enter_link;
1795 2352
1796 (async { 2353 (async {
2354 my $map = eval {
1797 my $map = cf::map::find $path; 2355 my $map = cf::map::find $path;
2356
2357 if ($map) {
1798 $map = $map->customise_for ($self) if $map; 2358 $map = $map->customise_for ($self);
1799 2359 $map = $check->($map) if $check && $map;
1800# warn "entering ", $map->path, " at ($x, $y)\n" 2360 } else {
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2362 }
1804 2363
2364 $map
2365 };
2366
2367 if ($@) {
2368 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2369 LOG llevError | logBacktrace, Carp::longmess $@;
2370 }
2371
2372 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation};
1805 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2375 }
2376
2377 $done->() if $done;
1806 })->prio (1); 2378 })->prio (1);
1807} 2379}
1808 2380
1809=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
1810 2382
1839 # that depends on the exit object 2411 # that depends on the exit object
1840 2412
1841 my $rmp = parse_random_map_params $exit->msg; 2413 my $rmp = parse_random_map_params $exit->msg;
1842 2414
1843 if ($exit->map) { 2415 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 2416 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 2417 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 2418 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 2419 $rmp->{origin_y} = $exit->y;
1848 } 2420 }
1849 2421
1850 $rmp->{random_seed} ||= $exit->random_seed; 2422 $rmp->{random_seed} ||= $exit->random_seed;
1851 2423
1852 my $data = cf::to_json $rmp; 2424 my $data = cf::to_json $rmp;
1853 my $md5 = Digest::MD5::md5_hex $data; 2425 my $md5 = Digest::MD5::md5_hex $data;
1854 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2426 my $meta = "$RANDOMDIR/$md5.meta";
1855 2427
1856 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1857 aio_write $fh, 0, (length $data), $data, 0; 2429 aio_write $fh, 0, (length $data), $data, 0;
1858 undef $fh; 2430 undef $fh;
1859 aio_rename "$meta~", $meta; 2431 aio_rename "$meta~", $meta;
1866sub cf::object::player::enter_exit { 2438sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 2439 my ($self, $exit) = @_;
1868 2440
1869 return unless $self->type == cf::PLAYER; 2441 return unless $self->type == cf::PLAYER;
1870 2442
2443 if ($exit->slaying eq "/!") {
2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
2447 cf::sync_job { prepare_random_map $exit };
2448 }
2449
2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2451 my $hp = $exit->stats->hp;
2452 my $sp = $exit->stats->sp;
2453
1871 $self->enter_link; 2454 $self->enter_link;
2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
1872 2459
1873 (async { 2460 (async {
1874 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 2462 unless (eval {
1876 prepare_random_map $exit 2463 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 2464
1882 1; 2465 1;
1883 }) { 2466 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 2467 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 2468 . "I'll try to bring you back to the map you were before. "
1886 . "Please report this to the dungeon master!", 2469 . "Please report this to the dungeon master!",
1887 cf::NDI_UNIQUE | cf::NDI_RED); 2470 cf::NDI_UNIQUE | cf::NDI_RED);
1888 2471
1889 warn "ERROR in enter_exit: $@"; 2472 warn "ERROR in enter_exit: $@";
1890 $self->leave_link; 2473 $self->leave_link;
1891 } 2474 }
1892 })->prio (1); 2475 })->prio (1);
1905 2488
1906sub cf::client::send_drawinfo { 2489sub cf::client::send_drawinfo {
1907 my ($self, $text, $flags) = @_; 2490 my ($self, $text, $flags) = @_;
1908 2491
1909 utf8::encode $text; 2492 utf8::encode $text;
1910 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1911} 2494}
1912 2495
2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2497
2498Send a drawinfo or msg packet to the client, formatting the msg for the
2499client if neccessary. C<$type> should be a string identifying the type of
2500the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet.
2502
2503=cut
2504
2505sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_;
2507
2508 $msg = $self->pl->expand_cfpod ($msg);
2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2531 } else {
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556}
2557
2558=item $client->ext_msg ($type, @msg)
2559
2560Sends an ext event to the client.
2561
2562=cut
2563
2564sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_;
2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2591}
1913 2592
1914=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
1915 2594
1916Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
1917the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2596the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1918C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2597C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1919 2598
1920Queries can fail, so check the return code. Or don't, as queries will become 2599Queries can fail, so check the return code. Or don't, as queries will
1921reliable at some point in the future. 2600become reliable at some point in the future.
1922 2601
1923=cut 2602=cut
1924 2603
1925sub cf::client::query { 2604sub cf::client::query {
1926 my ($self, $flags, $text, $cb) = @_; 2605 my ($self, $flags, $text, $cb) = @_;
1934 utf8::encode $text; 2613 utf8::encode $text;
1935 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2614 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1936 2615
1937 $self->send_packet ($self->{query_queue}[0][0]) 2616 $self->send_packet ($self->{query_queue}[0][0])
1938 if @{ $self->{query_queue} } == 1; 2617 if @{ $self->{query_queue} } == 1;
2618
2619 1
1939} 2620}
1940 2621
1941cf::client->attach ( 2622cf::client->attach (
2623 on_connect => sub {
2624 my ($ns) = @_;
2625
2626 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2627 },
1942 on_reply => sub { 2628 on_reply => sub {
1943 my ($ns, $msg) = @_; 2629 my ($ns, $msg) = @_;
1944 2630
1945 # this weird shuffling is so that direct followup queries 2631 # this weird shuffling is so that direct followup queries
1946 # get handled first 2632 # get handled first
1947 my $queue = delete $ns->{query_queue} 2633 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2634 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2635
1950 (shift @$queue)->[1]->($msg); 2636 (shift @$queue)->[1]->($msg);
2637 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2638
1952 push @{ $ns->{query_queue} }, @$queue; 2639 push @{ $ns->{query_queue} }, @$queue;
1953 2640
1954 if (@{ $ns->{query_queue} } == @$queue) { 2641 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2642 if (@$queue) {
1957 } else { 2644 } else {
1958 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2645 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1959 } 2646 }
1960 } 2647 }
1961 }, 2648 },
2649 on_exticmd => sub {
2650 my ($ns, $buf) = @_;
2651
2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2653
2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2662 if (my $cb = $EXTICMD{$type}) {
2663 @reply = $cb->($ns, @payload);
2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2669 } else {
2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2671 }
2672
2673 cf::override;
2674 },
1962); 2675);
1963 2676
1964=item $client->async (\&cb) 2677=item $client->async (\&cb)
1965 2678
1966Create a new coroutine, running the specified callback. The coroutine will 2679Create a new coroutine, running the specified callback. The coroutine will
2007our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2008our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2009 2722
2010$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2011 2724
2012$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2013 2730
2014# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2015 2732
2016=pod 2733=pod
2017 2734
2018The following fucntions and emthods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2019 2736
2020 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2021 cf::object::player player 2741 cf::object::player
2022 cf::player peaceful 2742 player
2023 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2024 2749
2025=cut 2750=cut
2026 2751
2027for ( 2752for (
2028 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2029 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2030 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2031 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2032) { 2759) {
2033 no strict 'refs'; 2760 no strict 'refs';
2104=back 2831=back
2105 2832
2106=cut 2833=cut
2107 2834
2108############################################################################# 2835#############################################################################
2836# the server's init and main functions
2109 2837
2110=head2 EXTENSION DATABASE SUPPORT 2838sub load_facedata($) {
2839 my ($path) = @_;
2111 2840
2112Crossfire maintains a very simple database for extension use. It can 2841 # HACK to clear player env face cache, we need some signal framework
2113currently store anything that can be serialised using Storable, which 2842 # for this (global event?)
2114excludes objects. 2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2115 2844
2116The parameter C<$family> should best start with the name of the extension 2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2117using it, it should be unique.
2118 2846
2119=over 4 2847 warn "loading facedata from $path\n";
2120 2848
2121=item $hashref = cf::db_get $family 2849 my $facedata;
2850 0 < aio_load $path, $facedata
2851 or die "$path: $!";
2122 2852
2123Return a hashref for use by the extension C<$family>, which can be 2853 $facedata = Coro::Storable::thaw $facedata;
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126 2854
2127=item $value = cf::db_get $family => $key 2855 $facedata->{version} == 2
2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2128 2857
2129Returns a single value from the database 2858 # patch in the exptable
2130 2859 $facedata->{resource}{"res/exp_table"} = {
2131=item cf::db_put $family => $hashref 2860 type => FT_RSRC,
2132 2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135
2136=item cf::db_put $family => $key => $value
2137
2138Stores the given C<$value> in the family hash. Updates are delayed, if you
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148
2149=cut
2150
2151our $DB;
2152
2153{
2154 my $path = cf::localdir . "/database.pst";
2155
2156 sub db_load() {
2157 $DB = stat $path ? Storable::retrieve $path : { };
2158 }
2159
2160 my $pid;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 }
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 }); 2862 };
2863 cf::cede_to_tick;
2182 2864
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 } 2865 {
2866 my $faces = $facedata->{faceinfo};
2187 2867
2188 sub db_get($;$) { 2868 while (my ($face, $info) = each %$faces) {
2189 @_ >= 2 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2190 ? $DB->{$_[0]}{$_[1]} 2870 cf::face::set_visibility $idx, $info->{visibility};
2191 : ($DB->{$_[0]} ||= { }) 2871 cf::face::set_magicmap $idx, $info->{magicmap};
2192 } 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2193 2874
2194 sub db_put($$;$) { 2875 cf::cede_to_tick;
2195 if (@_ >= 3) {
2196 $DB->{$_[0]}{$_[1]} = $_[2];
2197 } else {
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2876 }
2208 );
2209}
2210 2877
2211############################################################################# 2878 while (my ($face, $info) = each %$faces) {
2212# the server's main() 2879 next unless $info->{smooth};
2880 my $idx = cf::face::find $face
2881 or next;
2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885 } else {
2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 }
2213 2888
2214sub cfg_load { 2889 cf::cede_to_tick;
2890 }
2891 }
2892
2893 {
2894 my $anims = $facedata->{animinfo};
2895
2896 while (my ($anim, $info) = each %$anims) {
2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2898 cf::cede_to_tick;
2899 }
2900
2901 cf::anim::invalidate_all; # d'oh
2902 }
2903
2904 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource};
2908
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914
2915 if ($info->{type} & 1) {
2916 # prepend meta info
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else {
2925 $data = $info->{data};
2926 }
2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick;
2932 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 }
2952
2953 1
2954}
2955
2956register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_;
2958
2959 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v);
2961 }
2962};
2963
2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2969 load_resource_file "$MAPDIR/regions"
2970 or die "unable to load regions file\n";
2971
2972 for (cf::region::list) {
2973 $_->{match} = qr/$_->{match}/
2974 if exists $_->{match};
2975 }
2976}
2977
2978sub reload_facedata {
2979 load_facedata "$DATADIR/facedata"
2980 or die "unable to load facedata\n";
2981}
2982
2983sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991}
2992
2993sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n";
2996}
2997
2998sub reload_resources {
2999 warn "reloading resource files...\n";
3000
3001 reload_regions;
3002 reload_facedata;
3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures;
3006
3007 warn "finished reloading resource files\n";
3008}
3009
3010sub init {
3011 reload_resources;
3012}
3013
3014sub reload_config {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2216 or return; 3016 or return;
2217 3017
2218 local $/; 3018 local $/;
2219 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
2220 3020
2239 (async { 3039 (async {
2240 Event::one_event; 3040 Event::one_event;
2241 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
2242 }; 3042 };
2243 3043
2244 cfg_load; 3044 reload_config;
2245 db_load; 3045 db_init;
2246 load_extensions; 3046 load_extensions;
2247 3047
2248 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
2249 Event::loop; 3049 Event::loop;
2250} 3050}
2254 3054
2255# install some emergency cleanup handlers 3055# install some emergency cleanup handlers
2256BEGIN { 3056BEGIN {
2257 for my $signal (qw(INT HUP TERM)) { 3057 for my $signal (qw(INT HUP TERM)) {
2258 Event->signal ( 3058 Event->signal (
3059 reentrant => 0,
2259 data => WF_AUTOCANCEL, 3060 data => WF_AUTOCANCEL,
2260 signal => $signal, 3061 signal => $signal,
3062 prio => 0,
2261 cb => sub { 3063 cb => sub {
2262 cf::cleanup "SIG$signal"; 3064 cf::cleanup "SIG$signal";
2263 }, 3065 },
2264 ); 3066 );
2265 } 3067 }
3068}
3069
3070sub write_runtime {
3071 my $runtime = "$LOCALDIR/runtime";
3072
3073 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time.
3075
3076 IO::AIO::aio_utime $runtime, undef, undef;
3077
3078 my $guard = cf::lock_acquire "write_runtime";
3079
3080 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3081 or return;
3082
3083 my $value = $cf::RUNTIME + 90 + 10;
3084 # 10 is the runtime save interval, for a monotonic clock
3085 # 60 allows for the watchdog to kill the server.
3086
3087 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3088 and return;
3089
3090 # always fsync - this file is important
3091 aio_fsync $fh
3092 and return;
3093
3094 # touch it again to show we are up-to-date
3095 aio_utime $fh, undef, undef;
3096
3097 close $fh
3098 or return;
3099
3100 aio_rename "$runtime~", $runtime
3101 and return;
3102
3103 warn "runtime file written.\n";
3104
3105 1
2266} 3106}
2267 3107
2268sub emergency_save() { 3108sub emergency_save() {
2269 my $freeze_guard = cf::freeze_mainloop; 3109 my $freeze_guard = cf::freeze_mainloop;
2270 3110
2287 my $map = $cf::MAP{$path} or next; 3127 my $map = $cf::MAP{$path} or next;
2288 $map->valid or next; 3128 $map->valid or next;
2289 $map->save; 3129 $map->save;
2290 } 3130 }
2291 warn "end emergency map save\n"; 3131 warn "end emergency map save\n";
3132
3133 warn "begin emergency database checkpoint\n";
3134 BDB::db_env_txn_checkpoint $DB_ENV;
3135 warn "end emergency database checkpoint\n";
2292 }; 3136 };
2293 3137
2294 warn "leave emergency perl save\n"; 3138 warn "leave emergency perl save\n";
2295} 3139}
2296 3140
3141sub post_cleanup {
3142 my ($make_core) = @_;
3143
3144 warn Carp::longmess "post_cleanup backtrace"
3145 if $make_core;
3146}
3147
2297sub reload() { 3148sub do_reload_perl() {
2298 # can/must only be called in main 3149 # can/must only be called in main
2299 if ($Coro::current != $Coro::main) { 3150 if ($Coro::current != $Coro::main) {
2300 warn "can only reload from main coroutine"; 3151 warn "can only reload from main coroutine";
2301 return; 3152 return;
2302 } 3153 }
2303 3154
2304 warn "reloading..."; 3155 warn "reloading...";
2305 3156
2306 warn "cancelling server ticker"; 3157 warn "entering sync_job";
2307 $TICK_WATCHER->cancel;
2308 3158
3159 cf::sync_job {
3160 cf::write_runtime; # external watchdog should not bark
2309 cf::emergency_save; 3161 cf::emergency_save;
3162 cf::write_runtime; # external watchdog should not bark
2310 3163
2311 eval { 3164 warn "syncing database to disk";
3165 BDB::db_env_txn_checkpoint $DB_ENV;
3166
2312 # if anything goes wrong in here, we should simply crash as we already saved 3167 # if anything goes wrong in here, we should simply crash as we already saved
2313
2314 warn "syncing database to disk";
2315 cf::db_sync;
2316 3168
2317 warn "cancelling all WF_AUTOCANCEL watchers"; 3169 warn "cancelling all WF_AUTOCANCEL watchers";
2318 for (Event::all_watchers) { 3170 for (Event::all_watchers) {
2319 $_->cancel if $_->data & WF_AUTOCANCEL; 3171 $_->cancel if $_->data & WF_AUTOCANCEL;
2320 } 3172 }
2321 3173
2322 warn "flushing outstanding aio requests"; 3174 warn "flushing outstanding aio requests";
2323 for (;;) { 3175 for (;;) {
3176 BDB::flush;
2324 IO::AIO::flush; 3177 IO::AIO::flush;
2325 Coro::cede; 3178 Coro::cede;
2326 last unless IO::AIO::nreqs; 3179 last unless IO::AIO::nreqs || BDB::nreqs;
2327 warn "iterate..."; 3180 warn "iterate...";
2328 } 3181 }
3182
3183 ++$RELOAD;
2329 3184
2330 warn "cancelling all extension coros"; 3185 warn "cancelling all extension coros";
2331 $_->cancel for values %EXT_CORO; 3186 $_->cancel for values %EXT_CORO;
2332 %EXT_CORO = (); 3187 %EXT_CORO = ();
2333 3188
2334 warn "removing commands"; 3189 warn "removing commands";
2335 %COMMAND = (); 3190 %COMMAND = ();
2336 3191
2337 warn "removing ext commands"; 3192 warn "removing ext/exti commands";
2338 %EXTCMD = (); 3193 %EXTCMD = ();
3194 %EXTICMD = ();
2339 3195
2340 warn "unloading/nuking all extensions"; 3196 warn "unloading/nuking all extensions";
2341 for my $pkg (@EXTS) { 3197 for my $pkg (@EXTS) {
2342 warn "... unloading $pkg"; 3198 warn "... unloading $pkg";
2343 3199
2373 Symbol::delete_package "safe::$_" 3229 Symbol::delete_package "safe::$_"
2374 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3230 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2375 3231
2376 warn "unloading cf.pm \"a bit\""; 3232 warn "unloading cf.pm \"a bit\"";
2377 delete $INC{"cf.pm"}; 3233 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"};
2378 3235
2379 # don't, removes xs symbols, too, 3236 # don't, removes xs symbols, too,
2380 # and global variables created in xs 3237 # and global variables created in xs
2381 #Symbol::delete_package __PACKAGE__; 3238 #Symbol::delete_package __PACKAGE__;
2382 3239
2385 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
2386 require cf; 3243 require cf;
2387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2388 3245
2389 warn "loading config and database again"; 3246 warn "loading config and database again";
2390 cf::cfg_load; 3247 cf::reload_config;
2391 cf::db_load;
2392 3248
2393 warn "loading extensions"; 3249 warn "loading extensions";
2394 cf::load_extensions; 3250 cf::load_extensions;
2395 3251
2396 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";
2397 _global_reattach; 3253 _global_reattach; # objects, sockets
2398 warn "reattaching attachments to maps"; 3254 warn "reattaching attachments to maps";
2399 reattach $_ for values %MAP; 3255 reattach $_ for values %MAP;
3256 warn "reattaching attachments to players";
3257 reattach $_ for values %PLAYER;
2400 3258
2401 warn "restarting server ticker"; 3259 warn "leaving sync_job";
2402 3260
2403 $TICK_WATCHER->start; 3261 1
2404 }; 3262 } or do {
2405
2406 if ($@) {
2407 warn $@; 3263 warn $@;
2408 warn "error while reloading, exiting."; 3264 warn "error while reloading, exiting.";
2409 exit 1; 3265 exit 1;
2410 } 3266 };
2411 3267
2412 warn "reloaded"; 3268 warn "reloaded";
2413}; 3269};
2414 3270
2415our $RELOAD_WATCHER; # used only during reload 3271our $RELOAD_WATCHER; # used only during reload
2416 3272
3273sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here.
3276
3277 $RELOAD_WATCHER ||= Event->timer (
3278 reentrant => 0,
3279 after => 0,
3280 data => WF_AUTOCANCEL,
3281 cb => sub {
3282 do_reload_perl;
3283 undef $RELOAD_WATCHER;
3284 },
3285 );
3286}
3287
2417register_command "reload" => sub { 3288register_command "reload" => sub {
2418 my ($who, $arg) = @_; 3289 my ($who, $arg) = @_;
2419 3290
2420 if ($who->flag (FLAG_WIZ)) { 3291 if ($who->flag (FLAG_WIZ)) {
2421 $who->message ("reloading server."); 3292 $who->message ("reloading server.");
2422 3293 async { reload_perl };
2423 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here.
2425
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2427 reload;
2428 undef $RELOAD_WATCHER;
2429 });
2430 } 3294 }
2431}; 3295};
2432 3296
2433unshift @INC, $LIBDIR; 3297unshift @INC, $LIBDIR;
2434 3298
2435my $bug_warning = 0; 3299my $bug_warning = 0;
2436 3300
3301our @WAIT_FOR_TICK;
3302our @WAIT_FOR_TICK_BEGIN;
3303
3304sub wait_for_tick {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main;
3307
3308 my $signal = new Coro::Signal;
3309 push @WAIT_FOR_TICK, $signal;
3310 $signal->wait;
3311}
3312
3313sub wait_for_tick_begin {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main;
3316
3317 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait;
3320}
3321
3322 my $min = 1e6;#d#
3323 my $avg = 10;
2437$TICK_WATCHER = Event->timer ( 3324$TICK_WATCHER = Event->timer (
2438 reentrant => 0, 3325 reentrant => 0,
2439 parked => 1, 3326 parked => 1,
2440 prio => 0, 3327 prio => 0,
2441 at => $NEXT_TICK || $TICK, 3328 at => $NEXT_TICK || $TICK,
2445 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3332 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2446 unless ++$bug_warning > 10; 3333 unless ++$bug_warning > 10;
2447 return; 3334 return;
2448 } 3335 }
2449 3336
2450 $NOW = Event::time; 3337 $NOW = $tick_start = Event::time;
2451 3338
2452 cf::server_tick; # one server iteration 3339 cf::server_tick; # one server iteration
3340
3341 0 && sync_job {#d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 };
3363
2453 $RUNTIME += $TICK; 3364 $RUNTIME += $TICK;
2454 $NEXT_TICK += $TICK; 3365 $NEXT_TICK += $TICK;
2455 3366
2456 $WAIT_FOR_TICK->broadcast; 3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2457 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool {
3370 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!";
3372 };
3373 }
3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send;
3380 }
3381 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send;
3383 }
3384
3385 $NOW = Event::time;
2458 3386
2459 # if we are delayed by four ticks or more, skip them all 3387 # if we are delayed by four ticks or more, skip them all
2460 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2461 3389
2462 $TICK_WATCHER->at ($NEXT_TICK); 3390 $TICK_WATCHER->at ($NEXT_TICK);
2463 $TICK_WATCHER->start; 3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395
3396 _post_tick;
3397
3398
2464 }, 3399 },
2465); 3400);
2466 3401
3402{
3403 BDB::max_poll_time $TICK * 0.1;
3404 $BDB_POLL_WATCHER = Event->io (
3405 reentrant => 0,
3406 fd => BDB::poll_fileno,
3407 poll => 'r',
3408 prio => 0,
3409 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb,
3411 );
3412 BDB::min_parallel 8;
3413
3414 BDB::set_sync_prepare {
3415 my $status;
3416 my $current = $Coro::current;
3417 (
3418 sub {
3419 $status = $!;
3420 $current->ready; undef $current;
3421 },
3422 sub {
3423 Coro::schedule while defined $current;
3424 $! = $status;
3425 },
3426 )
3427 };
3428
3429 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create;
3431
3432 cf::sync_job {
3433 eval {
3434 BDB::db_env_open
3435 $DB_ENV,
3436 $BDBDIR,
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666;
3440
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 };
3446
3447 cf::cleanup "db_env_open(db): $@" if $@;
3448 };
3449 }
3450}
3451
3452{
3453 IO::AIO::min_parallel 8;
3454
3455 undef $Coro::AIO::WATCHER;
2467IO::AIO::max_poll_time $TICK * 0.2; 3456 IO::AIO::max_poll_time $TICK * 0.1;
2468
2469$AIO_POLL_WATCHER = Event->io ( 3457 $AIO_POLL_WATCHER = Event->io (
2470 fd => IO::AIO::poll_fileno, 3458 reentrant => 0,
2471 poll => 'r',
2472 prio => 5,
2473 data => WF_AUTOCANCEL,
2474 cb => \&IO::AIO::poll_cb,
2475);
2476
2477$WRITE_RUNTIME_WATCHER = Event->timer (
2478 data => WF_AUTOCANCEL, 3459 data => WF_AUTOCANCEL,
2479 after => 1, 3460 fd => IO::AIO::poll_fileno,
2480 interval => 10, 3461 poll => 'r',
2481 cb => Coro::unblock_sub { 3462 prio => 6,
2482 write_runtime 3463 cb => \&IO::AIO::poll_cb,
2483 or warn "ERROR: unable to write runtime file: $!"; 3464 );
3465}
3466
3467my $_log_backtrace;
3468
3469sub _log_backtrace {
3470 my ($msg, @addr) = @_;
3471
3472 $msg =~ s/\n//;
3473
3474 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace;
3477 async {
3478 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!";
3483
3484 my @funcs;
3485 my @res = <$fh>;
3486 chomp for @res;
3487 while (@res) {
3488 my ($func, $line) = splice @res, 0, 2, ();
3489 push @funcs, "[$func] $line";
3490 }
3491
3492 @funcs
3493 };
3494
3495 LOG llevInfo, "[ABT] $msg\n";
3496 LOG llevInfo, "[ABT] $_\n" for @bt;
3497 --$_log_backtrace;
3498 };
3499 } else {
3500 LOG llevInfo, "[ABT] $msg\n";
3501 LOG llevInfo, "[ABT] [suppressed]\n";
2484 }, 3502 }
2485); 3503}
3504
3505# load additional modules
3506use cf::pod;
2486 3507
2487END { cf::emergency_save } 3508END { cf::emergency_save }
2488 3509
24891 35101
2490 3511

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines