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.243 by root, Mon Apr 16 13:02:29 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 63
59our $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(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
70our %CFG; 87our %CFG;
71 88
72our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
73our $RUNTIME; 90our $RUNTIME;
74 91
75our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
76our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
77our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 95
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 103binmode STDOUT;
85binmode STDERR; 104binmode STDERR;
86 105
87# read virtual server time, if available 106# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
92} 111}
93 112
94mkdir cf::localdir; 113mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 115
101our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
102 117
103sub cf::map::normalise; 118sub cf::map::normalise;
104 119
115=item $cf::RUNTIME 130=item $cf::RUNTIME
116 131
117The 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
118every server tick. 133every server tick.
119 134
120=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
121 138
122The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 143
125=item $cf::NOW 144=item $cf::NOW
126 145
127The time of the last (current) server tick. 146The time of the last (current) server tick.
128 147
129=item $cf::TICK 148=item $cf::TICK
130 149
131The 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.
132 161
133=item %cf::CFG 162=item %cf::CFG
134 163
135Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 165from wherever your confdir points to.
139 168
140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
141returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
142per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
143 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.
178
144=back 179=back
145 180
146=cut 181=cut
147 182
148BEGIN { 183BEGIN {
149 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 185 my $msg = join "", @_;
151 utf8::encode $msg;
152 186
153 $msg .= "\n" 187 $msg .= "\n"
154 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
155 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
156 LOG llevError, $msg; 193 LOG llevError, $msg;
157 }; 194 };
158} 195}
159 196
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 204
167# 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
168# within the Safe compartment. 206# within the Safe compartment.
169for my $pkg (qw( 207for my $pkg (qw(
170 cf::global cf::attachable 208 cf::global cf::attachable
178} 216}
179 217
180$Event::DIED = sub { 218$Event::DIED = sub {
181 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
182}; 220};
221
222#############################################################################
183 223
184=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
185 225
186=over 4 226=over 4
187 227
206 $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;
207 $d 247 $d
208 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
209} 249}
210 250
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
214 252
215Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
216 254
217=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
218 256
219Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
220 265
221=item cf::lock_wait $string 266=item cf::lock_wait $string
222 267
223Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
224 269
227Wait 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
228a 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,
229for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
230returned. 275returned.
231 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
232Lock 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
233uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
234 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
235=cut 287=cut
236 288
237our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
238 291
239sub lock_wait($) { 292sub lock_wait($) {
240 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
241 299
242 # wait for lock, if any 300 # wait for lock, if any
243 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
244 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
245 Coro::schedule; 303 Coro::schedule;
251 309
252 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
253 lock_wait $key; 311 lock_wait $key;
254 312
255 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
256 315
257 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
258 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
260 } 320 }
321}
322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
261} 327}
262 328
263sub freeze_mainloop { 329sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
265 331
268 }; 334 };
269 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
270 $guard 336 $guard
271} 337}
272 338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
393}
394
273=item cf::async { BLOCK } 395=item cf::async { BLOCK }
274 396
275Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 398C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
280 402
281BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
282 404
283=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
284 406
285The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 408is 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. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
288 411
289If it must be done, put the blocking parts into C<sync_job>. This will run 412If 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 413the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
292fast or be very important. 415fast or be very important.
295 418
296sub sync_job(&) { 419sub sync_job(&) {
297 my ($job) = @_; 420 my ($job) = @_;
298 421
299 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
300 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
302 427
303 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 429 # (but this is cancel-safe)
315 440
316 while ($busy) { 441 while ($busy) {
317 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
318 } 443 }
319 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
320 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
321 } else { 453 } else {
322 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
323 455
324 $job->() 456 $job->()
343 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
344 476
345 $coro 477 $coro
346} 478}
347 479
348sub write_runtime { 480=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 481
351 my $runtime = cf::localdir . "/runtime"; 482Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
352 486
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 487=cut
354 or return;
355 488
356 my $value = $cf::RUNTIME + 90 + 10; 489sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 490 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 491
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 492 # we seemingly have to make a local copy of the whole thing,
361 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
362 495
363 # always fsync - this file is important 496 my @res = Coro::Util::fork_eval {
364 aio_fsync $fh 497 reset_signals;
365 and return; 498 &$cb
499 }, @args;
366 500
367 close $fh 501 wantarray ? @res : $res[-1]
368 or return; 502}
369 503
370 aio_rename "$runtime~", $runtime 504=item $value = cf::db_get $family => $key
371 and return;
372 505
506Returns a single value from the environment database.
507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
373 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
374} 618}
375 619
376=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
377 621
378Log a datalog packet of the given type with the given key-value pairs. 622Log a datalog packet of the given type with the given key-value pairs.
396attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
398 642
399In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 645Crossfire TRT).
402 646
403=over 4 647=over 4
404 648
405=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
406 650
569 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
570 814
571 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 819
576 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 821 my $pkg = shift @arg;
578 822
579 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
609 } 853 }
610 854
611 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
612 } else { 856 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 858 }
615 859
616 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
617} 861}
618 862
620 if (ref $_[0]) { 864 if (ref $_[0]) {
621 _object_attach @_; 865 _object_attach @_;
622 } else { 866 } else {
623 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
624 } 868 }
869 _recalc_want;
625}; 870};
626 871
627# all those should be optimised 872# all those should be optimised
628sub cf::attachable::detach { 873sub cf::attachable::detach {
629 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
633 reattach ($obj); 878 reattach ($obj);
634 } else { 879 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
636 } 881 }
882 _recalc_want;
637}; 883};
638 884
639sub cf::attachable::attached { 885sub cf::attachable::attached {
640 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
641 887
656 "; 902 ";
657 die if $@; 903 die if $@;
658} 904}
659 905
660our $override; 906our $override;
661our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
662 908
663sub override { 909sub override {
664 $override = 1; 910 $override = 1;
665 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
666} 912}
667 913
668sub do_invoke { 914sub do_invoke {
669 my $event = shift; 915 my $event = shift;
670 my $callbacks = shift; 916 my $callbacks = shift;
671 917
672 @invoke_results = (); 918 @INVOKE_RESULTS = ();
673 919
674 local $override; 920 local $override;
675 921
676 for (@$callbacks) { 922 for (@$callbacks) {
677 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
694 940
695Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
696 942
697This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
698removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
699results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 946
701=back 947=back
702 948
703=cut 949=cut
704 950
705############################################################################# 951#############################################################################
706# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
707 964
708sub reattach { 965sub reattach {
709 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 967 my ($obj) = @_;
711 968
755 }, 1012 },
756); 1013);
757 1014
758sub object_freezer_save { 1015sub object_freezer_save {
759 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
760 1019
761 sync_job { 1020 sync_job {
762 if (length $$rdata) { 1021 if (length $$rdata) {
763 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
764 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
788 } 1047 }
789 } else { 1048 } else {
790 aio_unlink $filename; 1049 aio_unlink $filename;
791 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
792 } 1051 }
793 } 1052 };
1053
1054 undef $guard;
794} 1055}
795 1056
796sub object_freezer_as_string { 1057sub object_freezer_as_string {
797 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
798 1059
803 1064
804sub object_thawer_load { 1065sub object_thawer_load {
805 my ($filename) = @_; 1066 my ($filename) = @_;
806 1067
807 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
808 1071
809 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
810 or return; 1073 or return;
811 1074
812 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
813 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
814 or return; 1077 or return;
1078
1079 undef $guard;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1081 }
817 1082
818 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
820 return ($data, $av); 1086 ($data, $av)
821} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
822 1094
823############################################################################# 1095#############################################################################
824# command handling &c 1096# command handling &c
825 1097
826=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1112}
841 1113
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1115
844Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
845 1121
846If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
847called. 1123called.
848 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
849=cut 1136=cut
850 1137
851sub register_extcmd { 1138sub register_extcmd {
852 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
853 1140
854 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
855} 1148}
856 1149
857cf::player->attach ( 1150cf::player->attach (
858 on_command => sub { 1151 on_command => sub {
859 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
868 cf::override; 1161 cf::override;
869 }, 1162 },
870 on_extcmd => sub { 1163 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
872 1165
873 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1167
875 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
881 } else { 1183 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1185 }
884 1186
885 cf::override; 1187 cf::override;
886 }, 1188 },
887); 1189);
888 1190
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
924 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1196 next unless -r $path;
926 eval { 1197
927 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
928 1 1255 }
929 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
930 } 1261 };
931} 1262}
932 1263
933############################################################################# 1264#############################################################################
934 1265
1266=back
1267
935=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
936 1269
937Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
938 1271
939=cut 1272=cut
944 1277
945=head3 cf::player 1278=head3 cf::player
946 1279
947=over 4 1280=over 4
948 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
949=item cf::player::find $login 1296=item cf::player::find $login
950 1297
951Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
952 1299
953=cut 1300=cut
954 1301
955sub playerdir($) { 1302sub playerdir($) {
956 cf::localdir 1303 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1304 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1305}
962 1306
963sub path($) { 1307sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1308 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
995 1339
996 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
997 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
998 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
999 } 1349 }
1000 } 1350 }
1001} 1351}
1002 1352
1012 1362
1013 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1014 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1015 1365
1016 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1017 Coro::cede; 1367 cf::cede_to_tick;
1018} 1368}
1019 1369
1020sub new($) { 1370sub new($) {
1021 my ($login) = @_; 1371 my ($login) = @_;
1022 1372
1026 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1027 1377
1028 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1029 1379
1030 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1031} 1391}
1032 1392
1033=item $pl->quit_character 1393=item $pl->quit_character
1034 1394
1035Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
1084while and may block, so not sync_job-capable, ever. 1444while and may block, so not sync_job-capable, ever.
1085 1445
1086=cut 1446=cut
1087 1447
1088sub list_logins { 1448sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1449 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1450 or return [];
1091 1451
1092 my @logins; 1452 my @logins;
1093 1453
1094 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1095 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1096 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1097 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1098 1463
1099 utf8::decode $login; 1464 utf8::decode $login;
1100 push @logins, $login; 1465 push @logins, $login;
1101 } 1466 }
1102 1467
1129 } 1494 }
1130 1495
1131 \@paths 1496 \@paths
1132} 1497}
1133 1498
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500
1501Expand crossfire pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1134=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1135 1551
1136Sends an ext reply to the player. 1552Sends an ext reply to the player.
1137 1553
1138=cut 1554=cut
1139 1555
1140sub ext_reply($$%) { 1556sub ext_reply($$@) {
1141 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1142 1558
1143 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1144
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1560}
1147 1561
1148=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1149 1563
1150Sends an ext event to the client. 1564Sends an ext event to the client.
1151 1565
1152=cut 1566=cut
1153 1567
1154sub ext_event($$%) { 1568sub ext_msg($$@) {
1155 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1156 1570
1157 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1158} 1572}
1159 1573
1160=head3 cf::region 1574=head3 cf::region
1161 1575
1162=over 4 1576=over 4
1165 1579
1166package cf::region; 1580package cf::region;
1167 1581
1168=item cf::region::find_by_path $path 1582=item cf::region::find_by_path $path
1169 1583
1170Tries to decuce the probable region for a map knowing only its path. 1584Tries to decuce the likely region for a map knowing only its path.
1171 1585
1172=cut 1586=cut
1173 1587
1174sub find_by_path($) { 1588sub find_by_path($) {
1175 my ($path) = @_; 1589 my ($path) = @_;
1176 1590
1177 my ($match, $specificity); 1591 my ($match, $specificity);
1178 1592
1179 for my $region (list) { 1593 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1183 } 1597 }
1184 } 1598 }
1185 1599
1249 my ($self, $merge) = @_; 1663 my ($self, $merge) = @_;
1250 1664
1251 # we have to keep some variables in memory intact 1665 # we have to keep some variables in memory intact
1252 local $self->{path}; 1666 local $self->{path};
1253 local $self->{load_path}; 1667 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1668
1257 $self->SUPER::thawer_merge ($merge); 1669 $self->SUPER::thawer_merge ($merge);
1258} 1670}
1259 1671
1260sub normalise { 1672sub normalise {
1307 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1308 return $self; 1720 return $self;
1309 } 1721 }
1310 } 1722 }
1311 1723
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1725 ()
1314} 1726}
1315 1727
1316sub init { 1728sub init {
1317 my ($self) = @_; 1729 my ($self) = @_;
1332 1744
1333# the original (read-only) location 1745# the original (read-only) location
1334sub load_path { 1746sub load_path {
1335 my ($self) = @_; 1747 my ($self) = @_;
1336 1748
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1749 "$MAPDIR/$self->{path}.map"
1338} 1750}
1339 1751
1340# the temporary/swap location 1752# the temporary/swap location
1341sub save_path { 1753sub save_path {
1342 my ($self) = @_; 1754 my ($self) = @_;
1343 1755
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1757 "$TMPDIR/$path.map"
1346} 1758}
1347 1759
1348# the unique path, undef == no special unique path 1760# the unique path, undef == no special unique path
1349sub uniq_path { 1761sub uniq_path {
1350 my ($self) = @_; 1762 my ($self) = @_;
1351 1763
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1765 "$UNIQUEDIR/$path"
1354} 1766}
1355 1767
1356# and all this just because we cannot iterate over 1768# and all this just because we cannot iterate over
1357# all maps in C++... 1769# all maps in C++...
1358sub change_all_map_light { 1770sub change_all_map_light {
1360 1772
1361 $_->change_map_light ($change) 1773 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1774 for grep $_->outdoor, values %cf::MAP;
1363} 1775}
1364 1776
1777sub decay_objects {
1778 my ($self) = @_;
1779
1780 return if $self->{deny_reset};
1781
1782 $self->do_decay_objects;
1783}
1784
1365sub unlink_save { 1785sub unlink_save {
1366 my ($self) = @_; 1786 my ($self) = @_;
1367 1787
1368 utf8::encode (my $save = $self->save_path); 1788 utf8::encode (my $save = $self->save_path);
1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1789 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1372 1792
1373sub load_header_from($) { 1793sub load_header_from($) {
1374 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1375 1795
1376 utf8::encode $path; 1796 utf8::encode $path;
1377 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1378 # or return;
1379
1380 $self->_load_header ($path)
1381 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1382 1805
1383 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1384 1807
1385 1 1808 1
1386} 1809}
1425 $self->load_header_orig 1848 $self->load_header_orig
1426 or return; 1849 or return;
1427 $self->prepare_orig; 1850 $self->prepare_orig;
1428 } 1851 }
1429 1852
1853 $self->{deny_reset} = 1
1854 if $self->no_reset;
1855
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1856 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1857 unless $self->default_region;
1432 1858
1433 1 1859 1
1434} 1860}
1437sub find { 1863sub find {
1438 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1439 1865
1440 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1441 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1442 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1443 1870
1444 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1445 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1446 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1447 or return; 1876 or return;
1448 1877
1449 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1450 1879
1451 $map->load_header 1880 $map->load_header
1452 or return; 1881 or return;
1453 1882
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1457 $map->reset; 1888 $map->reset;
1458 undef $guard;
1459 return find $path; 1889 return find $path;
1460 } 1890 }
1461 1891
1462 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1463 } 1893 }
1470 my ($self) = @_; 1900 my ($self) = @_;
1471 1901
1472 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1473 1903
1474 my $path = $self->{path}; 1904 my $path = $self->{path};
1905
1906 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1476 1908
1909 return unless $self->valid;
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1478 1911
1479 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1480 1913
1481 $self->alloc; 1914 $self->alloc;
1482 1915
1483 $self->pre_load; 1916 $self->pre_load;
1484 Coro::cede; 1917 cf::cede_to_tick;
1485 1918
1486 $self->_load_objects ($self->{load_path}, 1) 1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1921 $self->_load_objects ($f)
1487 or return; 1922 or return;
1488 1923
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1491 1926
1492 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq; 1928 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1495 $self->clear_unique_items; 1931 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1497 } 1935 }
1498 } 1936 }
1499 1937
1500 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1501 # now do the right thing for maps 1941 # now do the right thing for maps
1502 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede;
1510 $self->set_darkness_map;
1511 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1944 unless $self->difficulty;
1513 Coro::cede; 1945 cf::cede_to_tick;
1946
1947 unless ($self->{deny_activate}) {
1948 $self->decay_objects;
1949 $self->fix_auto_apply;
1950 $self->update_buttons;
1951 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1514 $self->activate; 1954 $self->activate;
1515 Coro::cede; 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1959
1960 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1961 }
1517 1962
1518 $self->post_load; 1963 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1964}
1523 1965
1524sub customise_for { 1966sub customise_for {
1525 my ($self, $ob) = @_; 1967 my ($self, $ob) = @_;
1526 1968
1527 return find "~" . $ob->name . "/" . $self->{path} 1969 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1970 if $self->per_player;
1529 1971
1972# return find "?party/" . $ob->name . "/" . $self->{path}
1973# if $self->per_party;
1974
1530 $self 1975 $self
1531} 1976}
1532 1977
1533# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1534sub load_diag { 1979sub load_neighbours {
1535 my ($map) = @_; 1980 my ($map) = @_;
1536 1981
1537 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1538 1983
1539 for (0 .. 3) { 1984 for (0 .. 3) {
1540 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1541 or next; 1986 or next;
1542 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1543 or next; 1988 or next;
1544 $neigh->load; 1989 $neigh->load;
1545 1990
1991 push @neigh,
1546 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1547 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1548 } 1994 }
1549 1995
1550 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1551 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1552 or next; 1999 or next;
1553 $neigh->load; 2000 $neigh->load;
1554 } 2001 }
1555} 2002}
1556 2003
1561} 2008}
1562 2009
1563sub do_load_sync { 2010sub do_load_sync {
1564 my ($map) = @_; 2011 my ($map) = @_;
1565 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1566 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1567} 2017}
1568 2018
1569our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1570our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1571 2021
1572sub find_async { 2022sub find_async {
1573 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1574 2024
1575 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1576 2026
1577 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1579 } 2029 }
1580 2030
1581 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1582 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1585 my $map = find $path 2036 if (my $map = find $k) {
1586 or next;
1587 $map->load; 2037 $map->load if $v;
2038 }
1588 2039
1589 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1590 } 2041 }
1591 } 2042 }
1592 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1593 }; 2044 };
1594 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
1597} 2048}
1598 2049
1599sub save { 2050sub save {
1600 my ($self) = @_; 2051 my ($self) = @_;
1601 2052
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2054
1604 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1605 2056
1606 return unless $self->dirty; 2057 return unless $self->dirty;
1607 2058
1630 my ($self) = @_; 2081 my ($self) = @_;
1631 2082
1632 # save first because save cedes 2083 # save first because save cedes
1633 $self->save; 2084 $self->save;
1634 2085
1635 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1636 2087
1637 return if $self->players; 2088 return if $self->players;
1638 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1639 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1640 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1641 $self->clear; 2096 $self->clear;
1642 $self->in_memory (cf::MAP_SWAPPED);
1643} 2097}
1644 2098
1645sub reset_at { 2099sub reset_at {
1646 my ($self) = @_; 2100 my ($self) = @_;
1647 2101
1648 # TODO: safety, remove and allow resettable per-player maps 2102 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 2103 return 1e99 if $self->{deny_reset};
1651 2104
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 2107
1665 my ($self) = @_; 2118 my ($self) = @_;
1666 2119
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2121
1669 return if $self->players; 2122 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2123
1672 warn "resetting map ", $self->path;#d# 2124 warn "resetting map ", $self->path;
1673 2125
1674 $self->in_memory (cf::MAP_SWAPPED); 2126 $self->in_memory (cf::MAP_SWAPPED);
1675 2127
1676 # need to save uniques path 2128 # need to save uniques path
1677 unless ($self->{deny_save}) { 2129 unless ($self->{deny_save}) {
1681 if $uniq; 2133 if $uniq;
1682 } 2134 }
1683 2135
1684 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1685 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1686 $self->clear; 2140 $self->clear;
1687
1688 $_->clear_links_to ($self) for values %cf::MAP;
1689 2141
1690 $self->unlink_save; 2142 $self->unlink_save;
1691 $self->destroy; 2143 $self->destroy;
1692} 2144}
1693 2145
1694my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1695 2147
1696sub nuke { 2148sub nuke {
1697 my ($self) = @_; 2149 my ($self) = @_;
1698 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
1699 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
1700 2155
1701 $self->unlink_save; 2156 $self->unlink_save;
1702 2157
1703 bless $self, "cf::map"; 2158 bless $self, "cf::map";
1704 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
1705 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1706 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708 2163
1709 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
1710 2166
1711 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2168}
2169
2170=item $maps = cf::map::tmp_maps
2171
2172Returns an arrayref with all map paths of currently instantiated and saved
2173maps. May block.
2174
2175=cut
2176
2177sub tmp_maps() {
2178 [
2179 map {
2180 utf8::decode $_;
2181 /\.map$/
2182 ? normalise $_
2183 : ()
2184 } @{ aio_readdir $TMPDIR or [] }
2185 ]
2186}
2187
2188=item $maps = cf::map::random_maps
2189
2190Returns an arrayref with all map paths of currently instantiated and saved
2191random maps. May block.
2192
2193=cut
2194
2195sub random_maps() {
2196 [
2197 map {
2198 utf8::decode $_;
2199 /\.map$/
2200 ? normalise "?random/$_"
2201 : ()
2202 } @{ aio_readdir $RANDOMDIR or [] }
2203 ]
1712} 2204}
1713 2205
1714=item cf::map::unique_maps 2206=item cf::map::unique_maps
1715 2207
1716Returns an arrayref of paths of all shared maps that have 2208Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2209instantiated unique items. May block.
1718 2210
1719=cut 2211=cut
1720 2212
1721sub unique_maps() { 2213sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2214 [
1723 or return; 2215 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2216 utf8::decode $_;
1729 next if /\.pst$/; 2217 /\.map$/
1730 next unless /^$PATH_SEP/o; 2218 ? normalise $_
1731 2219 : ()
1732 push @paths, cf::map::normalise $_; 2220 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2221 ]
1734
1735 \@paths
1736} 2222}
1737 2223
1738package cf; 2224package cf;
1739 2225
1740=back 2226=back
1758 map { $_, inv_recursive_ $_->inv } @_ 2244 map { $_, inv_recursive_ $_->inv } @_
1759} 2245}
1760 2246
1761sub inv_recursive { 2247sub inv_recursive {
1762 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2249}
2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
1763} 2280}
1764 2281
1765package cf; 2282package cf;
1766 2283
1767=back 2284=back
1786 2303
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2304 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2305
1789 if ($self->{record_replies}) { 2306 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2307 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2308
1791 } else { 2309 } else {
2310 my $pl = $self->contr;
2311
2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2313 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315
2316 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2319 }
1794 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
1795} 2331}
1796 2332
1797=item $player_object->may ("access") 2333=item $player_object->may ("access")
1798 2334
1799Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
1846 $self->deactivate_recursive; 2382 $self->deactivate_recursive;
1847 2383
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2384 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2385
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2387 if $self->map && $self->map->{path} ne "{link}";
1852 2388
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2389 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2390}
1855 2391
1856sub cf::object::player::leave_link { 2392sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2393 my ($self, $map, $x, $y) = @_;
2394
2395 return unless $self->contr->active;
1858 2396
1859 my $link_pos = delete $self->{_link_pos}; 2397 my $link_pos = delete $self->{_link_pos};
1860 2398
1861 unless ($map) { 2399 unless ($map) {
1862 # restore original map position 2400 # restore original map position
1876 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
1877 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
1878 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
1879 2417
1880 $map->load; 2418 $map->load;
1881 $map->load_diag; 2419 $map->load_neighbours;
1882 2420
1883 return unless $self->contr->active; 2421 return unless $self->contr->active;
1884 $self->activate_recursive; 2422 $self->activate_recursive;
1885 2423
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
1888} 2426}
1889 2427
1890cf::player->attach ( 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2429
1894 # abort map switching before logout 2430Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2431her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2432that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2433the new (success) or old (failed) map position. In either case, $done will
1898 }; 2434be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2435
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2436=cut
2437
2438our $GOTOGEN;
1925 2439
1926sub cf::object::player::goto { 2440sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2442
2443 # do generation counting so two concurrent goto's will be executed in-order
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2445
1929 $self->enter_link; 2446 $self->enter_link;
1930 2447
1931 (async { 2448 (async {
1932 my $map = eval { 2449 my $map = eval {
1933 my $map = cf::map::find $path; 2450 my $map = cf::map::find $path;
2451
2452 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2453 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map;
2455 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2457 }
2458
1935 $map 2459 $map
2460 };
2461
2462 if ($@) {
2463 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2464 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2465 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2466
2467 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2470 }
2471
2472 $done->() if $done;
1940 })->prio (1); 2473 })->prio (1);
1941} 2474}
1942 2475
1943=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
1944 2477
1983 2516
1984 $rmp->{random_seed} ||= $exit->random_seed; 2517 $rmp->{random_seed} ||= $exit->random_seed;
1985 2518
1986 my $data = cf::to_json $rmp; 2519 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2520 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2521 my $meta = "$RANDOMDIR/$md5.meta";
1989 2522
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2524 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2525 undef $fh;
1993 aio_rename "$meta~", $meta; 2526 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
2015 2548
2016 $self->enter_link; 2549 $self->enter_link;
2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2017 2554
2018 (async { 2555 (async {
2019 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2557 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
2049 2586
2050 utf8::encode $text; 2587 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2589}
2053 2590
2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2592
2593Send a drawinfo or msg packet to the client, formatting the msg for the
2594client if neccessary. C<$type> should be a string identifying the type of
2595the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet.
2597
2598=cut
2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2615sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_;
2617
2618 $msg = $self->pl->expand_cfpod ($msg);
2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2645 } else {
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670}
2671
2054=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2055 2673
2056Sends an exti event to the client. 2674Sends an ext event to the client.
2057 2675
2058=cut 2676=cut
2059 2677
2060sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2061 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2062 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2063 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2065} 2705}
2066 2706
2067=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2068 2708
2069Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2710the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2711C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2712
2073Queries can fail, so check the return code. Or don't, as queries will become 2713Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2714become reliable at some point in the future.
2075 2715
2076=cut 2716=cut
2077 2717
2078sub cf::client::query { 2718sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2719 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2727 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2728 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2729
2090 $self->send_packet ($self->{query_queue}[0][0]) 2730 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2731 if @{ $self->{query_queue} } == 1;
2732
2733 1
2092} 2734}
2093 2735
2094cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
2095 on_reply => sub { 2742 on_reply => sub {
2096 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
2097 2744
2098 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
2099 # get handled first 2746 # get handled first
2111 } else { 2758 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2759 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2760 }
2114 } 2761 }
2115 }, 2762 },
2763 on_exticmd => sub {
2764 my ($ns, $buf) = @_;
2765
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767
2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2776 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload);
2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2783 } else {
2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2785 }
2786
2787 cf::override;
2788 },
2116); 2789);
2117 2790
2118=item $client->async (\&cb) 2791=item $client->async (\&cb)
2119 2792
2120Create a new coroutine, running the specified callback. The coroutine will 2793Create a new coroutine, running the specified callback. The coroutine will
2161our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2162our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2163 2836
2164$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2165 2838
2166$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2167 2844
2168# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2169 2846
2170=pod 2847=pod
2171 2848
2172The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2173 2850
2174 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2175 cf::object::player player 2855 cf::object::player
2176 cf::player peaceful 2856 player
2177 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2178 2863
2179=cut 2864=cut
2180 2865
2181for ( 2866for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2183 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2186) { 2873) {
2187 no strict 'refs'; 2874 no strict 'refs';
2258=back 2945=back
2259 2946
2260=cut 2947=cut
2261 2948
2262############################################################################# 2949#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2950# the server's init and main functions
2336 2951
2337sub load_facedata { 2952sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2953 my ($path) = @_;
2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2339 2960
2340 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2341 2962
2342 my $facedata; 2963 my $facedata;
2343 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2346 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2347 2968
2348 $facedata->{version} == 2 2969 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350 2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2351 { 2979 {
2352 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2353 2981
2354 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2359 Coro::cede; 2988
2989 cf::cede_to_tick;
2360 } 2990 }
2361 2991
2362 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2365 or next; 2995 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 2999 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 3001 }
2371 Coro::cede; 3002
3003 cf::cede_to_tick;
2372 } 3004 }
2373 } 3005 }
2374 3006
2375 { 3007 {
2376 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2377 3009
2378 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 3012 cf::cede_to_tick;
2381 } 3013 }
2382 3014
2383 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2384 } 3016 }
2385 3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
2386 1 3067 1
2387} 3068}
2388 3069
2389our $archetypes_loaded; 3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
2390 3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
3083 load_resource_file "$MAPDIR/regions"
3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
3090}
3091
3092sub reload_facedata {
3093 load_facedata "$DATADIR/facedata"
3094 or die "unable to load facedata\n";
3095}
3096
2391sub load_archetypes { 3097sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 3098 load_resource_file "$DATADIR/archetypes"
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 3099 or die "unable to load archetypes\n";
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir 3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
2395} 3105}
2396 3106
2397sub load_treasures { 3107sub reload_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir 3108 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n";
2399} 3110}
2400 3111
2401sub reload_resources { 3112sub reload_resources {
2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3113 warn "reloading resource files...\n";
2403 or die "unable to load regions file\n"; 3114
3115 reload_regions;
2404 load_facedata 3116 reload_facedata;
2405 or die "unable to load facedata\n"; 3117 #reload_archetypes;#d#
2406 load_archetypes 3118 reload_archetypes;
2407 or die "unable to load archetypes\n";
2408 load_treasures 3119 reload_treasures;
2409 or die "unable to load treasurelists\n"; 3120
3121 warn "finished reloading resource files\n";
2410} 3122}
2411 3123
2412sub init { 3124sub init {
2413 reload_resources; 3125 reload_resources;
2414} 3126}
2415 3127
2416sub cfg_load { 3128sub reload_config {
2417 open my $fh, "<:utf8", cf::confdir . "/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2418 or return; 3130 or return;
2419 3131
2420 local $/; 3132 local $/;
2421 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
2422 3134
2441 (async { 3153 (async {
2442 Event::one_event; 3154 Event::one_event;
2443 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2444 }; 3156 };
2445 3157
2446 cfg_load; 3158 reload_config;
2447 db_init; 3159 db_init;
2448 load_extensions; 3160 load_extensions;
2449 3161
2450 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2451 Event::loop; 3163 Event::loop;
2467 }, 3179 },
2468 ); 3180 );
2469 } 3181 }
2470} 3182}
2471 3183
3184sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time.
3189
3190 IO::AIO::aio_utime $runtime, undef, undef;
3191
3192 my $guard = cf::lock_acquire "write_runtime";
3193
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3195 or return;
3196
3197 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server.
3200
3201 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3202 and return;
3203
3204 # always fsync - this file is important
3205 aio_fsync $fh
3206 and return;
3207
3208 # touch it again to show we are up-to-date
3209 aio_utime $fh, undef, undef;
3210
3211 close $fh
3212 or return;
3213
3214 aio_rename "$runtime~", $runtime
3215 and return;
3216
3217 warn "runtime file written.\n";
3218
3219 1
3220}
3221
2472sub emergency_save() { 3222sub emergency_save() {
2473 my $freeze_guard = cf::freeze_mainloop; 3223 my $freeze_guard = cf::freeze_mainloop;
2474 3224
2475 warn "enter emergency perl save\n"; 3225 warn "enter emergency perl save\n";
2476 3226
2507 3257
2508 warn Carp::longmess "post_cleanup backtrace" 3258 warn Carp::longmess "post_cleanup backtrace"
2509 if $make_core; 3259 if $make_core;
2510} 3260}
2511 3261
2512sub reload() { 3262sub do_reload_perl() {
2513 # can/must only be called in main 3263 # can/must only be called in main
2514 if ($Coro::current != $Coro::main) { 3264 if ($Coro::current != $Coro::main) {
2515 warn "can only reload from main coroutine"; 3265 warn "can only reload from main coroutine";
2516 return; 3266 return;
2517 } 3267 }
2551 %EXT_CORO = (); 3301 %EXT_CORO = ();
2552 3302
2553 warn "removing commands"; 3303 warn "removing commands";
2554 %COMMAND = (); 3304 %COMMAND = ();
2555 3305
2556 warn "removing ext commands"; 3306 warn "removing ext/exti commands";
2557 %EXTCMD = (); 3307 %EXTCMD = ();
3308 %EXTICMD = ();
2558 3309
2559 warn "unloading/nuking all extensions"; 3310 warn "unloading/nuking all extensions";
2560 for my $pkg (@EXTS) { 3311 for my $pkg (@EXTS) {
2561 warn "... unloading $pkg"; 3312 warn "... unloading $pkg";
2562 3313
2592 Symbol::delete_package "safe::$_" 3343 Symbol::delete_package "safe::$_"
2593 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594 3345
2595 warn "unloading cf.pm \"a bit\""; 3346 warn "unloading cf.pm \"a bit\"";
2596 delete $INC{"cf.pm"}; 3347 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"};
2597 3349
2598 # don't, removes xs symbols, too, 3350 # don't, removes xs symbols, too,
2599 # and global variables created in xs 3351 # and global variables created in xs
2600 #Symbol::delete_package __PACKAGE__; 3352 #Symbol::delete_package __PACKAGE__;
2601 3353
2604 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2605 require cf; 3357 require cf;
2606 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2607 3359
2608 warn "loading config and database again"; 3360 warn "loading config and database again";
2609 cf::cfg_load; 3361 cf::reload_config;
2610 3362
2611 warn "loading extensions"; 3363 warn "loading extensions";
2612 cf::load_extensions; 3364 cf::load_extensions;
2613 3365
2614 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
2616 warn "reattaching attachments to maps"; 3368 warn "reattaching attachments to maps";
2617 reattach $_ for values %MAP; 3369 reattach $_ for values %MAP;
2618 warn "reattaching attachments to players"; 3370 warn "reattaching attachments to players";
2619 reattach $_ for values %PLAYER; 3371 reattach $_ for values %PLAYER;
2620 3372
2621 warn "loading reloadable resources";
2622 reload_resources;
2623
2624 warn "leaving sync_job"; 3373 warn "leaving sync_job";
2625 3374
2626 1 3375 1
2627 } or do { 3376 } or do {
2628 warn $@; 3377 warn $@;
2633 warn "reloaded"; 3382 warn "reloaded";
2634}; 3383};
2635 3384
2636our $RELOAD_WATCHER; # used only during reload 3385our $RELOAD_WATCHER; # used only during reload
2637 3386
3387sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here.
3390
3391 $RELOAD_WATCHER ||= Event->timer (
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl;
3397 undef $RELOAD_WATCHER;
3398 },
3399 );
3400}
3401
2638register_command "reload" => sub { 3402register_command "reload" => sub {
2639 my ($who, $arg) = @_; 3403 my ($who, $arg) = @_;
2640 3404
2641 if ($who->flag (FLAG_WIZ)) { 3405 if ($who->flag (FLAG_WIZ)) {
2642 $who->message ("reloading server."); 3406 $who->message ("reloading server.");
2643 3407 async { reload_perl };
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 reload;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656 } 3408 }
2657}; 3409};
2658 3410
2659unshift @INC, $LIBDIR; 3411unshift @INC, $LIBDIR;
2660 3412
2679 my $signal = new Coro::Signal; 3431 my $signal = new Coro::Signal;
2680 push @WAIT_FOR_TICK_BEGIN, $signal; 3432 push @WAIT_FOR_TICK_BEGIN, $signal;
2681 $signal->wait; 3433 $signal->wait;
2682} 3434}
2683 3435
3436 my $min = 1e6;#d#
3437 my $avg = 10;
2684$TICK_WATCHER = Event->timer ( 3438$TICK_WATCHER = Event->timer (
2685 reentrant => 0, 3439 reentrant => 0,
2686 parked => 1, 3440 parked => 1,
2687 prio => 0, 3441 prio => 0,
2688 at => $NEXT_TICK || $TICK, 3442 at => $NEXT_TICK || $TICK,
2692 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2693 unless ++$bug_warning > 10; 3447 unless ++$bug_warning > 10;
2694 return; 3448 return;
2695 } 3449 }
2696 3450
2697 $NOW = Event::time; 3451 $NOW = $tick_start = Event::time;
2698 3452
2699 cf::server_tick; # one server iteration 3453 cf::server_tick; # one server iteration
3454
3455 0 && sync_job {#d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 };
3477
2700 $RUNTIME += $TICK; 3478 $RUNTIME += $TICK;
2701 $NEXT_TICK += $TICK; 3479 $NEXT_TICK += $TICK;
2702 3480
2703 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704 $NEXT_RUNTIME_WRITE = $NOW + 10; 3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
2706 write_runtime 3484 write_runtime
2707 or warn "ERROR: unable to write runtime file: $!"; 3485 or warn "ERROR: unable to write runtime file: $!";
2708 }; 3486 };
2709 } 3487 }
2710 3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712 $sig->send; 3493 $sig->send;
2713 } 3494 }
2714 while (my $sig = shift @WAIT_FOR_TICK) { 3495 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send; 3496 $sig->send;
2716 } 3497 }
2717 3498
2718# my $AFTER = Event::time; 3499 $NOW = Event::time;
2719# warn $AFTER - $NOW;#d#
2720 3500
2721 # if we are delayed by four ticks or more, skip them all 3501 # if we are delayed by four ticks or more, skip them all
2722 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2723 3503
2724 $TICK_WATCHER->at ($NEXT_TICK); 3504 $TICK_WATCHER->at ($NEXT_TICK);
2725 $TICK_WATCHER->start; 3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509
3510 _post_tick;
3511
3512
2726 }, 3513 },
2727); 3514);
2728 3515
2729{ 3516{
2730 BDB::max_poll_time $TICK * 0.1; 3517 BDB::max_poll_time $TICK * 0.1;
2758 3545
2759 cf::sync_job { 3546 cf::sync_job {
2760 eval { 3547 eval {
2761 BDB::db_env_open 3548 BDB::db_env_open
2762 $DB_ENV, 3549 $DB_ENV,
2763 $BDB_ENV_DIR, 3550 $BDBDIR,
2764 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2765 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2766 0666; 3553 0666;
2767 3554
2768 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2769 3556
2770 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2771 $DB_ENV->set_lk_detect; 3558 $DB_ENV->set_lk_detect;
2772 }; 3559 };
2773 3560
2789 prio => 6, 3576 prio => 6,
2790 cb => \&IO::AIO::poll_cb, 3577 cb => \&IO::AIO::poll_cb,
2791 ); 3578 );
2792} 3579}
2793 3580
3581my $_log_backtrace;
3582
3583sub _log_backtrace {
3584 my ($msg, @addr) = @_;
3585
3586 $msg =~ s/\n//;
3587
3588 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace;
3591 async {
3592 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!";
3597
3598 my @funcs;
3599 my @res = <$fh>;
3600 chomp for @res;
3601 while (@res) {
3602 my ($func, $line) = splice @res, 0, 2, ();
3603 push @funcs, "[$func] $line";
3604 }
3605
3606 @funcs
3607 };
3608
3609 LOG llevInfo, "[ABT] $msg\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace;
3612 };
3613 } else {
3614 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n";
3616 }
3617}
3618
3619# load additional modules
3620use cf::pod;
3621
2794END { cf::emergency_save } 3622END { cf::emergency_save }
2795 3623
27961 36241
2797 3625

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines