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.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
21 25
26use JSON::XS ();
22use BDB (); 27use BDB ();
23use Data::Dumper; 28use Data::Dumper;
24use Digest::MD5; 29use Digest::MD5;
25use Fcntl; 30use Fcntl;
26use YAML::Syck (); 31use YAML::Syck ();
27use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
31# configure various modules to our taste 37# configure various modules to our taste
32# 38#
39$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 42
36$Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
37 44
45our %COMMAND = (); 52our %COMMAND = ();
46our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
47 54
48our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
52 60
53our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
54our @EVENT; 62our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 63
57our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 77our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 80our $NEXT_TICK;
62our $NOW; 81our $NOW;
68our %CFG; 87our %CFG;
69 88
70our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
71our $RUNTIME; 90our $RUNTIME;
72 91
73our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
74our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
75our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 95
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 103binmode STDOUT;
86binmode STDERR; 104binmode STDERR;
87 105
88# read virtual server time, if available 106# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
93} 111}
94 112
95mkdir cf::localdir; 113mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 115
102our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
103 117
104sub cf::map::normalise; 118sub cf::map::normalise;
105 119
116=item $cf::RUNTIME 130=item $cf::RUNTIME
117 131
118The 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
119every server tick. 133every server tick.
120 134
121=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
122 138
123The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 143
126=item $cf::NOW 144=item $cf::NOW
127 145
128The time of the last (current) server tick. 146The time of the last (current) server tick.
129 147
130=item $cf::TICK 148=item $cf::TICK
131 149
132The 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.
133 161
134=item %cf::CFG 162=item %cf::CFG
135 163
136Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 165from wherever your confdir points to.
138 166
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
140 168
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
145 178
146=back 179=back
147 180
148=cut 181=cut
149 182
150BEGIN { 183BEGIN {
151 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 185 my $msg = join "", @_;
153 utf8::encode $msg;
154 186
155 $msg .= "\n" 187 $msg .= "\n"
156 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
157 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
158 LOG llevError, $msg; 193 LOG llevError, $msg;
159 }; 194 };
160} 195}
161 196
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@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';
167@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)
168 204
169# 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
170# within the Safe compartment. 206# within the Safe compartment.
171for my $pkg (qw( 207for my $pkg (qw(
172 cf::global cf::attachable 208 cf::global cf::attachable
180} 216}
181 217
182$Event::DIED = sub { 218$Event::DIED = sub {
183 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
184}; 220};
221
222#############################################################################
185 223
186=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
187 225
188=over 4 226=over 4
189 227
208 $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;
209 $d 247 $d
210 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
211} 249}
212 250
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
216 252
217Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
218 254
219=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
220 256
221Converts 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]) }
222 265
223=item cf::lock_wait $string 266=item cf::lock_wait $string
224 267
225Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
226 269
229Wait 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
230a 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,
231for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
232returned. 275returned.
233 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
234Lock 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
235uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
236 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
237=cut 287=cut
238 288
239our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
240 291
241sub lock_wait($) { 292sub lock_wait($) {
242 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#
243 299
244 # wait for lock, if any 300 # wait for lock, if any
245 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
246 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
247 Coro::schedule; 303 Coro::schedule;
253 309
254 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
255 lock_wait $key; 311 lock_wait $key;
256 312
257 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
258 315
259 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
260 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
262 } 320 }
321}
322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
263} 327}
264 328
265sub freeze_mainloop { 329sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
267 331
270 }; 334 };
271 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
272 $guard 336 $guard
273} 337}
274 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
275=item cf::async { BLOCK } 395=item cf::async { BLOCK }
276 396
277Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
278C<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
279thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
282 402
283BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
284 404
285=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
286 406
287The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
290 411
291If 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
292the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
293server 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
294fast or be very important. 415fast or be very important.
297 418
298sub sync_job(&) { 419sub sync_job(&) {
299 my ($job) = @_; 420 my ($job) = @_;
300 421
301 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
302 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
304 427
305 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 429 # (but this is cancel-safe)
317 440
318 while ($busy) { 441 while ($busy) {
319 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
320 } 443 }
321 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
322 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
323 } else { 453 } else {
324 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
325 455
326 $job->() 456 $job->()
345 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
346 476
347 $coro 477 $coro
348} 478}
349 479
350sub write_runtime { 480=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 481
353 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.
354 486
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 487=cut
356 or return;
357 488
358 my $value = $cf::RUNTIME + 90 + 10; 489sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 490 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 491
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 492 # we seemingly have to make a local copy of the whole thing,
363 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
364 495
365 # always fsync - this file is important 496 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 497 reset_signals;
367 and return; 498 &$cb
499 }, @args;
368 500
369 close $fh 501 wantarray ? @res : $res[-1]
370 or return; 502}
371 503
372 aio_rename "$runtime~", $runtime 504=item $value = cf::db_get $family => $key
373 and return;
374 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 };
375 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"
376} 618}
377 619
378=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
379 621
380Log 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.
398attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
400 642
401In 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>
402C<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
403crossfire+). 645Crossfire TRT).
404 646
405=over 4 647=over 4
406 648
407=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
408 650
571 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
572 814
573 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 819
578 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 821 my $pkg = shift @arg;
580 822
581 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
611 } 853 }
612 854
613 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
614 } else { 856 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 858 }
617 859
618 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
619} 861}
620 862
622 if (ref $_[0]) { 864 if (ref $_[0]) {
623 _object_attach @_; 865 _object_attach @_;
624 } else { 866 } else {
625 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
626 } 868 }
869 _recalc_want;
627}; 870};
628 871
629# all those should be optimised 872# all those should be optimised
630sub cf::attachable::detach { 873sub cf::attachable::detach {
631 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
635 reattach ($obj); 878 reattach ($obj);
636 } else { 879 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
638 } 881 }
882 _recalc_want;
639}; 883};
640 884
641sub cf::attachable::attached { 885sub cf::attachable::attached {
642 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
643 887
658 "; 902 ";
659 die if $@; 903 die if $@;
660} 904}
661 905
662our $override; 906our $override;
663our @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?
664 908
665sub override { 909sub override {
666 $override = 1; 910 $override = 1;
667 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
668} 912}
669 913
670sub do_invoke { 914sub do_invoke {
671 my $event = shift; 915 my $event = shift;
672 my $callbacks = shift; 916 my $callbacks = shift;
673 917
674 @invoke_results = (); 918 @INVOKE_RESULTS = ();
675 919
676 local $override; 920 local $override;
677 921
678 for (@$callbacks) { 922 for (@$callbacks) {
679 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
696 940
697Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
698 942
699This 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
700removed 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
701results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 946
703=back 947=back
704 948
705=cut 949=cut
706 950
707############################################################################# 951#############################################################################
708# 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}
709 964
710sub reattach { 965sub reattach {
711 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 967 my ($obj) = @_;
713 968
757 }, 1012 },
758); 1013);
759 1014
760sub object_freezer_save { 1015sub object_freezer_save {
761 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
762 1019
763 sync_job { 1020 sync_job {
764 if (length $$rdata) { 1021 if (length $$rdata) {
765 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
766 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
790 } 1047 }
791 } else { 1048 } else {
792 aio_unlink $filename; 1049 aio_unlink $filename;
793 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
794 } 1051 }
795 } 1052 };
1053
1054 undef $guard;
796} 1055}
797 1056
798sub object_freezer_as_string { 1057sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
800 1059
805 1064
806sub object_thawer_load { 1065sub object_thawer_load {
807 my ($filename) = @_; 1066 my ($filename) = @_;
808 1067
809 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
810 1071
811 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
812 or return; 1073 or return;
813 1074
814 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
815 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
816 or return; 1077 or return;
1078
1079 undef $guard;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1081 }
819 1082
820 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
822 return ($data, $av); 1086 ($data, $av)
823} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
824 1094
825############################################################################# 1095#############################################################################
826# command handling &c 1096# command handling &c
827 1097
828=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1112}
843 1113
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1115
846Register 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.
847 1121
848If 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
849called. 1123called.
850 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
851=cut 1136=cut
852 1137
853sub register_extcmd { 1138sub register_extcmd {
854 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
855 1140
856 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
857} 1148}
858 1149
859cf::player->attach ( 1150cf::player->attach (
860 on_command => sub { 1151 on_command => sub {
861 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
870 cf::override; 1161 cf::override;
871 }, 1162 },
872 on_extcmd => sub { 1163 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
874 1165
875 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1167
877 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
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
883 } else { 1183 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1185 }
886 1186
887 cf::override; 1187 cf::override;
888 }, 1188 },
889); 1189);
890 1190
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
926 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1196 next unless -r $path;
928 eval { 1197
929 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;
930 1 1255 }
931 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
932 } 1261 };
933} 1262}
934 1263
935############################################################################# 1264#############################################################################
936 1265
1266=back
1267
937=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
938 1269
939Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
940 1271
941=cut 1272=cut
953Returns the given player object, loading it if necessary (might block). 1284Returns the given player object, loading it if necessary (might block).
954 1285
955=cut 1286=cut
956 1287
957sub playerdir($) { 1288sub playerdir($) {
958 cf::localdir 1289 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1290 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1291}
964 1292
965sub path($) { 1293sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1294 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
997 1325
998 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
999 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1000 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1001 } 1335 }
1002 } 1336 }
1003} 1337}
1004 1338
1014 1348
1015 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1016 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1017 1351
1018 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1019 Coro::cede; 1353 cf::cede_to_tick;
1020} 1354}
1021 1355
1022sub new($) { 1356sub new($) {
1023 my ($login) = @_; 1357 my ($login) = @_;
1024 1358
1028 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1029 1363
1030 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1031 1365
1032 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1033} 1377}
1034 1378
1035=item $pl->quit_character 1379=item $pl->quit_character
1036 1380
1037Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
1086while and may block, so not sync_job-capable, ever. 1430while and may block, so not sync_job-capable, ever.
1087 1431
1088=cut 1432=cut
1089 1433
1090sub list_logins { 1434sub list_logins {
1091 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1435 my $dirs = aio_readdir $PLAYERDIR
1092 or return []; 1436 or return [];
1093 1437
1094 my @logins; 1438 my @logins;
1095 1439
1096 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1097 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1098 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1099 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1100 1449
1101 utf8::decode $login; 1450 utf8::decode $login;
1102 push @logins, $login; 1451 push @logins, $login;
1103 } 1452 }
1104 1453
1131 } 1480 }
1132 1481
1133 \@paths 1482 \@paths
1134} 1483}
1135 1484
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1486
1487Expand crossfire pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1136=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1137 1537
1138Sends an ext reply to the player. 1538Sends an ext reply to the player.
1139 1539
1140=cut 1540=cut
1141 1541
1142sub ext_reply($$%) { 1542sub ext_reply($$@) {
1143 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1144 1544
1145 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1146
1147 $self->send ("ext " . cf::to_json \%msg);
1148} 1546}
1149 1547
1150=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1151 1549
1152Sends an ext event to the client. 1550Sends an ext event to the client.
1153 1551
1154=cut 1552=cut
1155 1553
1156sub ext_event($$%) { 1554sub ext_msg($$@) {
1157 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1158 1556
1159 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1160} 1558}
1161 1559
1162package cf; 1560=head3 cf::region
1561
1562=over 4
1563
1564=cut
1565
1566package cf::region;
1567
1568=item cf::region::find_by_path $path
1569
1570Tries to decuce the likely region for a map knowing only its path.
1571
1572=cut
1573
1574sub find_by_path($) {
1575 my ($path) = @_;
1576
1577 my ($match, $specificity);
1578
1579 for my $region (list) {
1580 if ($region->{match} && $path =~ $region->{match}) {
1581 ($match, $specificity) = ($region, $region->specificity)
1582 if $region->specificity > $specificity;
1583 }
1584 }
1585
1586 $match
1587}
1163 1588
1164=back 1589=back
1165
1166 1590
1167=head3 cf::map 1591=head3 cf::map
1168 1592
1169=over 4 1593=over 4
1170 1594
1225 my ($self, $merge) = @_; 1649 my ($self, $merge) = @_;
1226 1650
1227 # we have to keep some variables in memory intact 1651 # we have to keep some variables in memory intact
1228 local $self->{path}; 1652 local $self->{path};
1229 local $self->{load_path}; 1653 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1654
1233 $self->SUPER::thawer_merge ($merge); 1655 $self->SUPER::thawer_merge ($merge);
1234} 1656}
1235 1657
1236sub normalise { 1658sub normalise {
1283 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1284 return $self; 1706 return $self;
1285 } 1707 }
1286 } 1708 }
1287 1709
1288 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1289 () 1711 ()
1290} 1712}
1291 1713
1292sub init { 1714sub init {
1293 my ($self) = @_; 1715 my ($self) = @_;
1308 1730
1309# the original (read-only) location 1731# the original (read-only) location
1310sub load_path { 1732sub load_path {
1311 my ($self) = @_; 1733 my ($self) = @_;
1312 1734
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1735 "$MAPDIR/$self->{path}.map"
1314} 1736}
1315 1737
1316# the temporary/swap location 1738# the temporary/swap location
1317sub save_path { 1739sub save_path {
1318 my ($self) = @_; 1740 my ($self) = @_;
1319 1741
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1743 "$TMPDIR/$path.map"
1322} 1744}
1323 1745
1324# the unique path, undef == no special unique path 1746# the unique path, undef == no special unique path
1325sub uniq_path { 1747sub uniq_path {
1326 my ($self) = @_; 1748 my ($self) = @_;
1327 1749
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1751 "$UNIQUEDIR/$path"
1330} 1752}
1331 1753
1332# and all this just because we cannot iterate over 1754# and all this just because we cannot iterate over
1333# all maps in C++... 1755# all maps in C++...
1334sub change_all_map_light { 1756sub change_all_map_light {
1336 1758
1337 $_->change_map_light ($change) 1759 $_->change_map_light ($change)
1338 for grep $_->outdoor, values %cf::MAP; 1760 for grep $_->outdoor, values %cf::MAP;
1339} 1761}
1340 1762
1763sub decay_objects {
1764 my ($self) = @_;
1765
1766 return if $self->{deny_reset};
1767
1768 $self->do_decay_objects;
1769}
1770
1341sub unlink_save { 1771sub unlink_save {
1342 my ($self) = @_; 1772 my ($self) = @_;
1343 1773
1344 utf8::encode (my $save = $self->save_path); 1774 utf8::encode (my $save = $self->save_path);
1345 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1775 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1348 1778
1349sub load_header_from($) { 1779sub load_header_from($) {
1350 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1351 1781
1352 utf8::encode $path; 1782 utf8::encode $path;
1353 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1354 # or return;
1355
1356 $self->_load_header ($path)
1357 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1358 1791
1359 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1360 1793
1361 1 1794 1
1362} 1795}
1401 $self->load_header_orig 1834 $self->load_header_orig
1402 or return; 1835 or return;
1403 $self->prepare_orig; 1836 $self->prepare_orig;
1404 } 1837 }
1405 1838
1839 $self->{deny_reset} = 1
1840 if $self->no_reset;
1841
1842 $self->default_region (cf::region::find_by_path $self->{path})
1843 unless $self->default_region;
1844
1406 1 1845 1
1407} 1846}
1408 1847
1409sub find; 1848sub find;
1410sub find { 1849sub find {
1411 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1412 1851
1413 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1414 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1415 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1416 1856
1417 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1418 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1419 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1420 or return; 1862 or return;
1421 1863
1422 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1423 1865
1424 $map->load_header 1866 $map->load_header
1425 or return; 1867 or return;
1426 1868
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1430 $map->reset; 1874 $map->reset;
1431 undef $guard;
1432 return find $path; 1875 return find $path;
1433 } 1876 }
1434 1877
1435 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1436 } 1879 }
1443 my ($self) = @_; 1886 my ($self) = @_;
1444 1887
1445 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1446 1889
1447 my $path = $self->{path}; 1890 my $path = $self->{path};
1891
1892 {
1448 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1449 1894
1895 return unless $self->valid;
1450 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1451 1897
1452 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1453 1899
1454 $self->alloc; 1900 $self->alloc;
1455 1901
1456 $self->pre_load; 1902 $self->pre_load;
1903 cf::cede_to_tick;
1457 1904
1458 $self->_load_objects ($self->{load_path}, 1) 1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1907 $self->_load_objects ($f)
1459 or return; 1908 or return;
1460 1909
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1463 1912
1464 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1465 utf8::encode $uniq; 1914 utf8::encode $uniq;
1466 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1467 $self->clear_unique_items; 1917 $self->clear_unique_items;
1468 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1469 } 1921 }
1470 } 1922 }
1471 1923
1472 Coro::cede; 1924 $f->resolve_delayed_derefs;
1473 1925
1926 cf::cede_to_tick;
1474 # now do the right thing for maps 1927 # now do the right thing for maps
1475 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1476
1477 unless ($self->{deny_activate}) {
1478 $self->decay_objects;
1479 $self->fix_auto_apply;
1480 $self->update_buttons;
1481 Coro::cede;
1482 $self->set_darkness_map;
1483 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1930 unless $self->difficulty;
1485 Coro::cede; 1931 cf::cede_to_tick;
1932
1933 unless ($self->{deny_activate}) {
1934 $self->decay_objects;
1935 $self->fix_auto_apply;
1936 $self->update_buttons;
1937 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1486 $self->activate; 1940 $self->activate;
1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1945
1946 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 1947 }
1488 1948
1489 $self->post_load; 1949 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1950}
1493 1951
1494sub customise_for { 1952sub customise_for {
1495 my ($self, $ob) = @_; 1953 my ($self, $ob) = @_;
1496 1954
1497 return find "~" . $ob->name . "/" . $self->{path} 1955 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 1956 if $self->per_player;
1499 1957
1958# return find "?party/" . $ob->name . "/" . $self->{path}
1959# if $self->per_party;
1960
1500 $self 1961 $self
1501} 1962}
1502 1963
1503# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1504sub load_diag { 1965sub load_neighbours {
1505 my ($map) = @_; 1966 my ($map) = @_;
1506 1967
1507 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1508 1969
1509 for (0 .. 3) { 1970 for (0 .. 3) {
1510 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1511 or next; 1972 or next;
1512 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1513 or next; 1974 or next;
1514 $neigh->load; 1975 $neigh->load;
1515 1976
1977 push @neigh,
1516 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1517 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1518 } 1980 }
1519 1981
1520 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1521 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1522 or next; 1985 or next;
1523 $neigh->load; 1986 $neigh->load;
1524 } 1987 }
1525} 1988}
1526 1989
1531} 1994}
1532 1995
1533sub do_load_sync { 1996sub do_load_sync {
1534 my ($map) = @_; 1997 my ($map) = @_;
1535 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1536 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1537} 2003}
1538 2004
1539our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1540our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1541 2007
1542sub find_async { 2008sub find_async {
1543 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1544 2010
1545 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1546 2012
1547 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1548 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1549 } 2015 }
1550 2016
1551 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1552 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1553 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1554 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1555 my $map = find $path 2022 if (my $map = find $k) {
1556 or next;
1557 $map->load; 2023 $map->load if $v;
2024 }
1558 2025
1559 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1560 } 2027 }
1561 } 2028 }
1562 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1563 }; 2030 };
1564 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
1567} 2034}
1568 2035
1569sub save { 2036sub save {
1570 my ($self) = @_; 2037 my ($self) = @_;
1571 2038
1572 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1573 2040
1574 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1575 2042
1576 return unless $self->dirty; 2043 return unless $self->dirty;
1577 2044
1600 my ($self) = @_; 2067 my ($self) = @_;
1601 2068
1602 # save first because save cedes 2069 # save first because save cedes
1603 $self->save; 2070 $self->save;
1604 2071
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 2073
1607 return if $self->players; 2074 return if $self->players;
1608 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1609 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1610 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1611 $self->clear; 2082 $self->clear;
1612 $self->in_memory (cf::MAP_SWAPPED);
1613} 2083}
1614 2084
1615sub reset_at { 2085sub reset_at {
1616 my ($self) = @_; 2086 my ($self) = @_;
1617 2087
1618 # TODO: safety, remove and allow resettable per-player maps 2088 # TODO: safety, remove and allow resettable per-player maps
1619 return 1e99 if $self->isa ("ext::map_per_player");#d#
1620 return 1e99 if $self->{deny_reset}; 2089 return 1e99 if $self->{deny_reset};
1621 2090
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2091 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2092 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 2093
1635 my ($self) = @_; 2104 my ($self) = @_;
1636 2105
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2106 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2107
1639 return if $self->players; 2108 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 2109
1642 warn "resetting map ", $self->path;#d# 2110 warn "resetting map ", $self->path;
1643 2111
1644 $self->in_memory (cf::MAP_SWAPPED); 2112 $self->in_memory (cf::MAP_SWAPPED);
1645 2113
1646 # need to save uniques path 2114 # need to save uniques path
1647 unless ($self->{deny_save}) { 2115 unless ($self->{deny_save}) {
1651 if $uniq; 2119 if $uniq;
1652 } 2120 }
1653 2121
1654 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
1655 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
1656 $self->clear; 2126 $self->clear;
1657
1658 $_->clear_links_to ($self) for values %cf::MAP;
1659 2127
1660 $self->unlink_save; 2128 $self->unlink_save;
1661 $self->destroy; 2129 $self->destroy;
1662} 2130}
1663 2131
1664my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
1665 2133
1666sub nuke { 2134sub nuke {
1667 my ($self) = @_; 2135 my ($self) = @_;
1668 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
1669 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
1670 2141
1671 $self->unlink_save; 2142 $self->unlink_save;
1672 2143
1673 bless $self, "cf::map"; 2144 bless $self, "cf::map";
1674 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
1675 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
1676 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
1677 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1678 2149
1679 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
1680 2152
1681 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2154}
2155
2156=item $maps = cf::map::tmp_maps
2157
2158Returns an arrayref with all map paths of currently instantiated and saved
2159maps. May block.
2160
2161=cut
2162
2163sub tmp_maps() {
2164 [
2165 map {
2166 utf8::decode $_;
2167 /\.map$/
2168 ? normalise $_
2169 : ()
2170 } @{ aio_readdir $TMPDIR or [] }
2171 ]
2172}
2173
2174=item $maps = cf::map::random_maps
2175
2176Returns an arrayref with all map paths of currently instantiated and saved
2177random maps. May block.
2178
2179=cut
2180
2181sub random_maps() {
2182 [
2183 map {
2184 utf8::decode $_;
2185 /\.map$/
2186 ? normalise "?random/$_"
2187 : ()
2188 } @{ aio_readdir $RANDOMDIR or [] }
2189 ]
1682} 2190}
1683 2191
1684=item cf::map::unique_maps 2192=item cf::map::unique_maps
1685 2193
1686Returns an arrayref of paths of all shared maps that have 2194Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 2195instantiated unique items. May block.
1688 2196
1689=cut 2197=cut
1690 2198
1691sub unique_maps() { 2199sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2200 [
1693 or return; 2201 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 2202 utf8::decode $_;
1699 next if /\.pst$/; 2203 /\.map$/
1700 next unless /^$PATH_SEP/o; 2204 ? normalise $_
1701 2205 : ()
1702 push @paths, cf::map::normalise $_; 2206 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 2207 ]
1704
1705 \@paths
1706} 2208}
1707 2209
1708package cf; 2210package cf;
1709 2211
1710=back 2212=back
1728 map { $_, inv_recursive_ $_->inv } @_ 2230 map { $_, inv_recursive_ $_->inv } @_
1729} 2231}
1730 2232
1731sub inv_recursive { 2233sub inv_recursive {
1732 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2235}
2236
2237=item $ref = $ob->ref
2238
2239creates and returns a persistent reference to an objetc that can be stored as a string.
2240
2241=item $ob = cf::object::deref ($refstring)
2242
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block.
2245
2246=cut
2247
2248sub deref {
2249 my ($ref) = @_;
2250
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return;
2258 $pl->ob->uuid eq $uuid
2259 or return;
2260
2261 $pl->ob
2262 } else {
2263 warn "$ref: cannot resolve object reference\n";
2264 undef
2265 }
1733} 2266}
1734 2267
1735package cf; 2268package cf;
1736 2269
1737=back 2270=back
1756 2289
1757 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2290 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1758 2291
1759 if ($self->{record_replies}) { 2292 if ($self->{record_replies}) {
1760 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2293 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2294
1761 } else { 2295 } else {
2296 my $pl = $self->contr;
2297
2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2299 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301
2302 } else {
1762 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
1763 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2305 }
1764 } 2306 }
2307}
2308
2309=item $object->send_msg ($channel, $msg, $color, [extra...])
2310
2311=cut
2312
2313sub cf::object::send_msg {
2314 my $pl = shift->contr
2315 or return;
2316 $pl->send_msg (@_);
1765} 2317}
1766 2318
1767=item $player_object->may ("access") 2319=item $player_object->may ("access")
1768 2320
1769Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
1816 $self->deactivate_recursive; 2368 $self->deactivate_recursive;
1817 2369
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2370 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 2371
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2372 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 2373 if $self->map && $self->map->{path} ne "{link}";
1822 2374
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2375 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 2376}
1825 2377
1826sub cf::object::player::leave_link { 2378sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 2379 my ($self, $map, $x, $y) = @_;
2380
2381 return unless $self->contr->active;
1828 2382
1829 my $link_pos = delete $self->{_link_pos}; 2383 my $link_pos = delete $self->{_link_pos};
1830 2384
1831 unless ($map) { 2385 unless ($map) {
1832 # restore original map position 2386 # restore original map position
1846 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
1847 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
1848 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
1849 2403
1850 $map->load; 2404 $map->load;
1851 $map->load_diag; 2405 $map->load_neighbours;
1852 2406
1853 return unless $self->contr->active; 2407 return unless $self->contr->active;
1854 $self->activate_recursive; 2408 $self->activate_recursive;
1855 2409
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2411 $self->enter_map ($map, $x, $y);
1858} 2412}
1859 2413
1860cf::player->attach ( 2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1861 on_logout => sub {
1862 my ($pl) = @_;
1863 2415
1864 # abort map switching before logout 2416Moves the player to the given map-path and coordinates by first freezing
1865 if ($pl->ob->{_link_pos}) { 2417her, loading and preparing them map, calling the provided $check callback
1866 cf::sync_job { 2418that has to return the map if sucecssful, and then unfreezes the player on
1867 $pl->ob->leave_link 2419the new (success) or old (failed) map position. In either case, $done will
1868 }; 2420be called at the end of this process.
1869 }
1870 },
1871 on_login => sub {
1872 my ($pl) = @_;
1873 2421
1874 # try to abort aborted map switching on player login :)
1875 # should happen only on crashes
1876 if ($pl->ob->{_link_pos}) {
1877 $pl->ob->enter_link;
1878 (async {
1879 $pl->ob->reply (undef,
1880 "There was an internal problem at your last logout, "
1881 . "the server will try to bring you to your intended destination in a second.",
1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1885 Coro::Timer::sleep 1;
1886 $pl->ob->leave_link;
1887 })->prio (2);
1888 }
1889 },
1890);
1891
1892=item $player_object->goto ($path, $x, $y)
1893
1894=cut 2422=cut
2423
2424our $GOTOGEN;
1895 2425
1896sub cf::object::player::goto { 2426sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2427 my ($self, $path, $x, $y, $check, $done) = @_;
2428
2429 # do generation counting so two concurrent goto's will be executed in-order
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2431
1899 $self->enter_link; 2432 $self->enter_link;
1900 2433
1901 (async { 2434 (async {
1902 my $map = eval { 2435 my $map = eval {
1903 my $map = cf::map::find $path; 2436 my $map = cf::map::find $path;
2437
2438 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2439 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map;
2441 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2443 }
2444
1905 $map 2445 $map
2446 };
2447
2448 if ($@) {
2449 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2450 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2451 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2452
2453 if ($gen == $self->{_goto_generation}) {
2454 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2455 $self->leave_link ($map, $x, $y);
2456 }
2457
2458 $done->() if $done;
1910 })->prio (1); 2459 })->prio (1);
1911} 2460}
1912 2461
1913=item $player_object->enter_exit ($exit_object) 2462=item $player_object->enter_exit ($exit_object)
1914 2463
1953 2502
1954 $rmp->{random_seed} ||= $exit->random_seed; 2503 $rmp->{random_seed} ||= $exit->random_seed;
1955 2504
1956 my $data = cf::to_json $rmp; 2505 my $data = cf::to_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2506 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2507 my $meta = "$RANDOMDIR/$md5.meta";
1959 2508
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2510 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2511 undef $fh;
1963 aio_rename "$meta~", $meta; 2512 aio_rename "$meta~", $meta;
1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1983 my $hp = $exit->stats->hp; 2532 my $hp = $exit->stats->hp;
1984 my $sp = $exit->stats->sp; 2533 my $sp = $exit->stats->sp;
1985 2534
1986 $self->enter_link; 2535 $self->enter_link;
2536
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
1987 2540
1988 (async { 2541 (async {
1989 $self->deactivate_recursive; # just to be sure 2542 $self->deactivate_recursive; # just to be sure
1990 unless (eval { 2543 unless (eval {
1991 $self->goto ($slaying, $hp, $sp); 2544 $self->goto ($slaying, $hp, $sp);
2019 2572
2020 utf8::encode $text; 2573 utf8::encode $text;
2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2574 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2022} 2575}
2023 2576
2577=item $client->send_msg ($channel, $msg, $color, [extra...])
2578
2579Send a drawinfo or msg packet to the client, formatting the msg for the
2580client if neccessary. C<$type> should be a string identifying the type of
2581the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet.
2583
2584=cut
2585
2586our %CHANNEL = (
2587 "c/identify" => {
2588 id => "identify",
2589 title => "Identify",
2590 reply => undef,
2591 tooltip => "Items recently identified",
2592 },
2593 "c/examine" => {
2594 id => "examine",
2595 title => "Examine",
2596 reply => undef,
2597 tooltip => "Signs and other items you examined",
2598 },
2599);
2600
2601sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_;
2603
2604 $msg = $self->pl->expand_cfpod ($msg);
2605
2606 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607
2608 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2610
2611 if (ref $channel) {
2612 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2617 }
2618
2619 $channel = $channel->{id};
2620 }
2621
2622 return unless @extra || length $msg;
2623
2624 if ($self->can_msg) {
2625 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF;
2628
2629 $self->send_packet ("msg " . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2631 } else {
2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642
2643 $color &= cf::NDI_COLOR_MASK;
2644
2645 utf8::encode $msg;
2646
2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2650 } else {
2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2652 $self->send_packet ("drawinfo $color $msg")
2653 }
2654 }
2655 }
2656}
2657
2024=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2025 2659
2026Sends an exti event to the client. 2660Sends an ext event to the client.
2027 2661
2028=cut 2662=cut
2029 2663
2030sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2031 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2032 2666
2667 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2033 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg); 2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 }
2673}
2674
2675=item $client->ext_reply ($msgid, @msg)
2676
2677Sends an ext reply to the client.
2678
2679=cut
2680
2681sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_;
2683
2684 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id;
2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2690 }
2035} 2691}
2036 2692
2037=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2038 2694
2039Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2696the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2041C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2697C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2042 2698
2043Queries can fail, so check the return code. Or don't, as queries will become 2699Queries can fail, so check the return code. Or don't, as queries will
2044reliable at some point in the future. 2700become reliable at some point in the future.
2045 2701
2046=cut 2702=cut
2047 2703
2048sub cf::client::query { 2704sub cf::client::query {
2049 my ($self, $flags, $text, $cb) = @_; 2705 my ($self, $flags, $text, $cb) = @_;
2057 utf8::encode $text; 2713 utf8::encode $text;
2058 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2714 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2059 2715
2060 $self->send_packet ($self->{query_queue}[0][0]) 2716 $self->send_packet ($self->{query_queue}[0][0])
2061 if @{ $self->{query_queue} } == 1; 2717 if @{ $self->{query_queue} } == 1;
2718
2719 1
2062} 2720}
2063 2721
2064cf::client->attach ( 2722cf::client->attach (
2723 on_connect => sub {
2724 my ($ns) = @_;
2725
2726 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2727 },
2065 on_reply => sub { 2728 on_reply => sub {
2066 my ($ns, $msg) = @_; 2729 my ($ns, $msg) = @_;
2067 2730
2068 # this weird shuffling is so that direct followup queries 2731 # this weird shuffling is so that direct followup queries
2069 # get handled first 2732 # get handled first
2081 } else { 2744 } else {
2082 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2745 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2083 } 2746 }
2084 } 2747 }
2085 }, 2748 },
2749 on_exticmd => sub {
2750 my ($ns, $buf) = @_;
2751
2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2753
2754 if (ref $msg) {
2755 my ($type, $reply, @payload) =
2756 "ARRAY" eq ref $msg
2757 ? @$msg
2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2759
2760 my @reply;
2761
2762 if (my $cb = $EXTICMD{$type}) {
2763 @reply = $cb->($ns, @payload);
2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2769 } else {
2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2771 }
2772
2773 cf::override;
2774 },
2086); 2775);
2087 2776
2088=item $client->async (\&cb) 2777=item $client->async (\&cb)
2089 2778
2090Create a new coroutine, running the specified callback. The coroutine will 2779Create a new coroutine, running the specified callback. The coroutine will
2131our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2132our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2133 2822
2134$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2135 2824
2136$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2825$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math
2827 grepstart grepwhile mapstart mapwhile
2828 sort time
2829));
2137 2830
2138# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2139 2832
2140=pod 2833=pod
2141 2834
2142The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2143 2836
2144 cf::object contr pay_amount pay_player map 2837 cf::object
2838 contr pay_amount pay_player map x y force_find force_add
2839 insert remove name archname title slaying race decrease_ob_nr
2840
2145 cf::object::player player 2841 cf::object::player
2146 cf::player peaceful 2842 player
2147 cf::map trigger 2843
2844 cf::player
2845 peaceful
2846
2847 cf::map
2848 trigger
2148 2849
2149=cut 2850=cut
2150 2851
2151for ( 2852for (
2152 ["cf::object" => qw(contr pay_amount pay_player map)], 2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race
2855 decrease_ob_nr)],
2153 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2154 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2155 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2156) { 2859) {
2157 no strict 'refs'; 2860 no strict 'refs';
2228=back 2931=back
2229 2932
2230=cut 2933=cut
2231 2934
2232############################################################################# 2935#############################################################################
2233
2234=head2 EXTENSION DATABASE SUPPORT
2235
2236Crossfire maintains a very simple database for extension use. It can
2237currently store anything that can be serialised using Storable, which
2238excludes objects.
2239
2240The parameter C<$family> should best start with the name of the extension
2241using it, it should be unique.
2242
2243=over 4
2244
2245=item $value = cf::db_get $family => $key
2246
2247Returns a single value from the database.
2248
2249=item cf::db_put $family => $key => $value
2250
2251Stores the given C<$value> in the family.
2252
2253=cut
2254
2255our $DB;
2256
2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2276
2277 cf::db_put (board => data => $pst->{board});
2278 cf::db_put (guildrules => data => $pst->{guildrules});
2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282 unlink $path;
2283 };
2284 }
2285 }
2286}
2287
2288sub db_get($$) {
2289 my $key = "$_[0]/$_[1]";
2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2299sub db_put($$$) {
2300 BDB::dbreq_pri 4;
2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions 2936# the server's init and main functions
2306 2937
2307sub load_facedata { 2938sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2939 my ($path) = @_;
2940
2941 # HACK to clear player env face cache, we need some signal framework
2942 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = ();
2944
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2309 2946
2310 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2311 2948
2312 my $faces; 2949 my $facedata;
2313 0 < aio_load $path, $faces 2950 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2951 or die "$path: $!";
2315 2952
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2953 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2954
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2955 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2957
2958 # patch in the exptable
2959 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2962 };
2963 cf::cede_to_tick;
2964
2965 {
2966 my $faces = $facedata->{faceinfo};
2967
2324 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2329 Coro::cede;
2330 }
2331 2974
2975 cf::cede_to_tick;
2976 }
2977
2332 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2979 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2980 my $idx = cf::face::find $face
2335 or next; 2981 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2982 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth; 2983 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2338 } else { 2985 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2986 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2987 }
2341 Coro::cede; 2988
2989 cf::cede_to_tick;
2990 }
2991 }
2992
2993 {
2994 my $anims = $facedata->{animinfo};
2995
2996 while (my ($anim, $info) = each %$anims) {
2997 cf::anim::set $anim, $info->{frames}, $info->{facings};
2998 cf::cede_to_tick;
2999 }
3000
3001 cf::anim::invalidate_all; # d'oh
3002 }
3003
3004 {
3005 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource};
3008
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
3014
3015 if ($info->{type} & 1) {
3016 # prepend meta info
3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
3024 } else {
3025 $data = $info->{data};
3026 }
3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick;
3032 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
2342 } 3051 }
2343 3052
2344 1 3053 1
2345} 3054}
2346 3055
3056register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_;
3058
3059 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v);
3061 }
3062};
3063
3064sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = ();
3068
3069 load_resource_file "$MAPDIR/regions"
3070 or die "unable to load regions file\n";
3071
3072 for (cf::region::list) {
3073 $_->{match} = qr/$_->{match}/
3074 if exists $_->{match};
3075 }
3076}
3077
3078sub reload_facedata {
3079 load_facedata "$DATADIR/facedata"
3080 or die "unable to load facedata\n";
3081}
3082
3083sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091}
3092
3093sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n";
3096}
3097
2347sub reload_resources { 3098sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3099 warn "reloading resource files...\n";
2349 or die "unable to load regions file\n";#d# 3100
3101 reload_regions;
2350 load_facedata 3102 reload_facedata;
2351 or die "unable to load facedata\n";#d# 3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures;
3106
3107 warn "finished reloading resource files\n";
2352} 3108}
2353 3109
2354sub init { 3110sub init {
2355 reload_resources; 3111 reload_resources;
2356} 3112}
2357 3113
2358sub cfg_load { 3114sub reload_config {
2359 open my $fh, "<:utf8", cf::confdir . "/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2360 or return; 3116 or return;
2361 3117
2362 local $/; 3118 local $/;
2363 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
2364 3120
2383 (async { 3139 (async {
2384 Event::one_event; 3140 Event::one_event;
2385 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2386 }; 3142 };
2387 3143
2388 cfg_load; 3144 reload_config;
2389 db_init; 3145 db_init;
2390 load_extensions; 3146 load_extensions;
2391 3147
2392 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2393 Event::loop; 3149 Event::loop;
2409 }, 3165 },
2410 ); 3166 );
2411 } 3167 }
2412} 3168}
2413 3169
3170sub write_runtime {
3171 my $runtime = "$LOCALDIR/runtime";
3172
3173 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time.
3175
3176 IO::AIO::aio_utime $runtime, undef, undef;
3177
3178 my $guard = cf::lock_acquire "write_runtime";
3179
3180 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3181 or return;
3182
3183 my $value = $cf::RUNTIME + 90 + 10;
3184 # 10 is the runtime save interval, for a monotonic clock
3185 # 60 allows for the watchdog to kill the server.
3186
3187 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3188 and return;
3189
3190 # always fsync - this file is important
3191 aio_fsync $fh
3192 and return;
3193
3194 # touch it again to show we are up-to-date
3195 aio_utime $fh, undef, undef;
3196
3197 close $fh
3198 or return;
3199
3200 aio_rename "$runtime~", $runtime
3201 and return;
3202
3203 warn "runtime file written.\n";
3204
3205 1
3206}
3207
2414sub emergency_save() { 3208sub emergency_save() {
2415 my $freeze_guard = cf::freeze_mainloop; 3209 my $freeze_guard = cf::freeze_mainloop;
2416 3210
2417 warn "enter emergency perl save\n"; 3211 warn "enter emergency perl save\n";
2418 3212
2449 3243
2450 warn Carp::longmess "post_cleanup backtrace" 3244 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core; 3245 if $make_core;
2452} 3246}
2453 3247
2454sub reload() { 3248sub do_reload_perl() {
2455 # can/must only be called in main 3249 # can/must only be called in main
2456 if ($Coro::current != $Coro::main) { 3250 if ($Coro::current != $Coro::main) {
2457 warn "can only reload from main coroutine"; 3251 warn "can only reload from main coroutine";
2458 return; 3252 return;
2459 } 3253 }
2493 %EXT_CORO = (); 3287 %EXT_CORO = ();
2494 3288
2495 warn "removing commands"; 3289 warn "removing commands";
2496 %COMMAND = (); 3290 %COMMAND = ();
2497 3291
2498 warn "removing ext commands"; 3292 warn "removing ext/exti commands";
2499 %EXTCMD = (); 3293 %EXTCMD = ();
3294 %EXTICMD = ();
2500 3295
2501 warn "unloading/nuking all extensions"; 3296 warn "unloading/nuking all extensions";
2502 for my $pkg (@EXTS) { 3297 for my $pkg (@EXTS) {
2503 warn "... unloading $pkg"; 3298 warn "... unloading $pkg";
2504 3299
2534 Symbol::delete_package "safe::$_" 3329 Symbol::delete_package "safe::$_"
2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3330 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536 3331
2537 warn "unloading cf.pm \"a bit\""; 3332 warn "unloading cf.pm \"a bit\"";
2538 delete $INC{"cf.pm"}; 3333 delete $INC{"cf.pm"};
3334 delete $INC{"cf/pod.pm"};
2539 3335
2540 # don't, removes xs symbols, too, 3336 # don't, removes xs symbols, too,
2541 # and global variables created in xs 3337 # and global variables created in xs
2542 #Symbol::delete_package __PACKAGE__; 3338 #Symbol::delete_package __PACKAGE__;
2543 3339
2546 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
2547 require cf; 3343 require cf;
2548 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2549 3345
2550 warn "loading config and database again"; 3346 warn "loading config and database again";
2551 cf::cfg_load; 3347 cf::reload_config;
2552 3348
2553 warn "loading extensions"; 3349 warn "loading extensions";
2554 cf::load_extensions; 3350 cf::load_extensions;
2555 3351
2556 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
2558 warn "reattaching attachments to maps"; 3354 warn "reattaching attachments to maps";
2559 reattach $_ for values %MAP; 3355 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players"; 3356 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER; 3357 reattach $_ for values %PLAYER;
2562 3358
2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job"; 3359 warn "leaving sync_job";
2567 3360
2568 1 3361 1
2569 } or do { 3362 } or do {
2570 warn $@; 3363 warn $@;
2575 warn "reloaded"; 3368 warn "reloaded";
2576}; 3369};
2577 3370
2578our $RELOAD_WATCHER; # used only during reload 3371our $RELOAD_WATCHER; # used only during reload
2579 3372
3373sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here.
3376
3377 $RELOAD_WATCHER ||= Event->timer (
3378 reentrant => 0,
3379 after => 0,
3380 data => WF_AUTOCANCEL,
3381 cb => sub {
3382 do_reload_perl;
3383 undef $RELOAD_WATCHER;
3384 },
3385 );
3386}
3387
2580register_command "reload" => sub { 3388register_command "reload" => sub {
2581 my ($who, $arg) = @_; 3389 my ($who, $arg) = @_;
2582 3390
2583 if ($who->flag (FLAG_WIZ)) { 3391 if ($who->flag (FLAG_WIZ)) {
2584 $who->message ("reloading server."); 3392 $who->message ("reloading server.");
2585 3393 async { reload_perl };
2586 # doing reload synchronously and two reloads happen back-to-back,
2587 # coro crashes during coro_state_free->destroy here.
2588
2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2594 reload;
2595 undef $RELOAD_WATCHER;
2596 },
2597 );
2598 } 3394 }
2599}; 3395};
2600 3396
2601unshift @INC, $LIBDIR; 3397unshift @INC, $LIBDIR;
2602 3398
2603my $bug_warning = 0; 3399my $bug_warning = 0;
2604 3400
3401our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN;
3403
3404sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main;
3407
3408 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait;
3411}
3412
3413sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main;
3416
3417 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait;
3420}
3421
3422 my $min = 1e6;#d#
3423 my $avg = 10;
2605$TICK_WATCHER = Event->timer ( 3424$TICK_WATCHER = Event->timer (
2606 reentrant => 0, 3425 reentrant => 0,
2607 parked => 1, 3426 parked => 1,
2608 prio => 0, 3427 prio => 0,
2609 at => $NEXT_TICK || $TICK, 3428 at => $NEXT_TICK || $TICK,
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10; 3433 unless ++$bug_warning > 10;
2615 return; 3434 return;
2616 } 3435 }
2617 3436
2618 $NOW = Event::time; 3437 $NOW = $tick_start = Event::time;
2619 3438
2620 cf::server_tick; # one server iteration 3439 cf::server_tick; # one server iteration
3440
3441 0 && sync_job {#d#
3442 for(1..10) {
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 };
3463
2621 $RUNTIME += $TICK; 3464 $RUNTIME += $TICK;
2622 $NEXT_TICK += $TICK; 3465 $NEXT_TICK += $TICK;
2623 3466
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10; 3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
2627 write_runtime 3470 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 3471 or warn "ERROR: unable to write runtime file: $!";
2629 }; 3472 };
2630 } 3473 }
2631 3474
2632 $WAIT_FOR_TICK->broadcast;
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time; 3475# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d# 3476# warn $AFTER - $NOW;#d#
2637 3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send;
3480 }
3481 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send;
3483 }
3484
3485 $NOW = Event::time;
3486
2638 # if we are delayed by four ticks or more, skip them all 3487 # if we are delayed by four ticks or more, skip them all
2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2640 3489
2641 $TICK_WATCHER->at ($NEXT_TICK); 3490 $TICK_WATCHER->at ($NEXT_TICK);
2642 $TICK_WATCHER->start; 3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495
3496 _post_tick;
3497
3498
2643 }, 3499 },
2644); 3500);
2645 3501
2646{ 3502{
2647 BDB::max_poll_time $TICK * 0.1; 3503 BDB::max_poll_time $TICK * 0.1;
2675 3531
2676 cf::sync_job { 3532 cf::sync_job {
2677 eval { 3533 eval {
2678 BDB::db_env_open 3534 BDB::db_env_open
2679 $DB_ENV, 3535 $DB_ENV,
2680 $BDB_ENV_DIR, 3536 $BDBDIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666; 3539 0666;
2684 3540
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686 3542
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect; 3544 $DB_ENV->set_lk_detect;
2689 }; 3545 };
2690 3546
2706 prio => 6, 3562 prio => 6,
2707 cb => \&IO::AIO::poll_cb, 3563 cb => \&IO::AIO::poll_cb,
2708 ); 3564 );
2709} 3565}
2710 3566
3567my $_log_backtrace;
3568
3569sub _log_backtrace {
3570 my ($msg, @addr) = @_;
3571
3572 $msg =~ s/\n//;
3573
3574 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace;
3577 async {
3578 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!";
3583
3584 my @funcs;
3585 my @res = <$fh>;
3586 chomp for @res;
3587 while (@res) {
3588 my ($func, $line) = splice @res, 0, 2, ();
3589 push @funcs, "[$func] $line";
3590 }
3591
3592 @funcs
3593 };
3594
3595 LOG llevInfo, "[ABT] $msg\n";
3596 LOG llevInfo, "[ABT] $_\n" for @bt;
3597 --$_log_backtrace;
3598 };
3599 } else {
3600 LOG llevInfo, "[ABT] $msg\n";
3601 LOG llevInfo, "[ABT] [suppressed]\n";
3602 }
3603}
3604
3605# load additional modules
3606use cf::pod;
3607
2711END { cf::emergency_save } 3608END { cf::emergency_save }
2712 3609
27131 36101
2714 3611

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines