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.227 by root, Fri Mar 23 18:32:48 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 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).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
236 286
237=cut 287=cut
238 288
239our %LOCK; 289our %LOCK;
240 290
258 308
259 Coro::guard { 309 Coro::guard {
260 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
262 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
263} 319}
264 320
265sub freeze_mainloop { 321sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
267 323
270 }; 326 };
271 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
272 $guard 328 $guard
273} 329}
274 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
275=item cf::async { BLOCK } 387=item cf::async { BLOCK }
276 388
277Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
282 394
283BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
284 396
285=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
286 398
287The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
290 403
291If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
294fast or be very important. 407fast or be very important.
297 410
298sub sync_job(&) { 411sub sync_job(&) {
299 my ($job) = @_; 412 my ($job) = @_;
300 413
301 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
302 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
304 419
305 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 421 # (but this is cancel-safe)
317 432
318 while ($busy) { 433 while ($busy) {
319 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
320 } 435 }
321 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
322 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
323 } else { 445 } else {
324 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
325 447
326 $job->() 448 $job->()
345 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
346 468
347 $coro 469 $coro
348} 470}
349 471
350sub write_runtime { 472=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 473
353 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
354 478
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
356 or return;
357 480
358 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 483
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
363 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (likely this will be rather laborious)
364 487
365 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 489 reset_signals;
367 and return; 490 &$cb
491 }, @args;
368 492
369 close $fh 493 wantarray ? @res : $res[-1]
370 or return; 494}
371 495
372 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
373 and return;
374 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
375 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
376} 621}
377 622
378=back 623=back
379 624
380=cut 625=cut
387attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
388to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
389 634
390In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
391C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
392crossfire+). 637Crossfire TRT).
393 638
394=over 4 639=over 4
395 640
396=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
397 642
560 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
561 806
562 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
563 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
564 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
565 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
566 811
567 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
568 my $pkg = shift @arg; 813 my $pkg = shift @arg;
569 814
570 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
599 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
600 } 845 }
601 846
602 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
603 } else { 848 } else {
604 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
605 } 850 }
606 851
607 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
608} 853}
609 854
611 if (ref $_[0]) { 856 if (ref $_[0]) {
612 _object_attach @_; 857 _object_attach @_;
613 } else { 858 } else {
614 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
615 } 860 }
861 _recalc_want;
616}; 862};
617 863
618# all those should be optimised 864# all those should be optimised
619sub cf::attachable::detach { 865sub cf::attachable::detach {
620 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
623 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
624 reattach ($obj); 870 reattach ($obj);
625 } else { 871 } else {
626 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
627 } 873 }
874 _recalc_want;
628}; 875};
629 876
630sub cf::attachable::attached { 877sub cf::attachable::attached {
631 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
632 879
647 "; 894 ";
648 die if $@; 895 die if $@;
649} 896}
650 897
651our $override; 898our $override;
652our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
653 900
654sub override { 901sub override {
655 $override = 1; 902 $override = 1;
656 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
657} 904}
658 905
659sub do_invoke { 906sub do_invoke {
660 my $event = shift; 907 my $event = shift;
661 my $callbacks = shift; 908 my $callbacks = shift;
662 909
663 @invoke_results = (); 910 @INVOKE_RESULTS = ();
664 911
665 local $override; 912 local $override;
666 913
667 for (@$callbacks) { 914 for (@$callbacks) {
668 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
685 932
686Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
687 934
688This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
689removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
690results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
691 938
692=back 939=back
693 940
694=cut 941=cut
695 942
696############################################################################# 943#############################################################################
697# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
698 956
699sub reattach { 957sub reattach {
700 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
701 my ($obj) = @_; 959 my ($obj) = @_;
702 960
746 }, 1004 },
747); 1005);
748 1006
749sub object_freezer_save { 1007sub object_freezer_save {
750 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
751 1011
752 sync_job { 1012 sync_job {
753 if (length $$rdata) { 1013 if (length $$rdata) {
754 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
755 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
779 } 1039 }
780 } else { 1040 } else {
781 aio_unlink $filename; 1041 aio_unlink $filename;
782 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
783 } 1043 }
784 } 1044 };
1045
1046 undef $guard;
785} 1047}
786 1048
787sub object_freezer_as_string { 1049sub object_freezer_as_string {
788 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
789 1051
794 1056
795sub object_thawer_load { 1057sub object_thawer_load {
796 my ($filename) = @_; 1058 my ($filename) = @_;
797 1059
798 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
799 1063
800 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
801 or return; 1065 or return;
802 1066
803 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
804 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
805 or return; 1069 or return;
1070
1071 undef $guard;
806 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
807 } 1073 }
808 1074
809 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
810 $filename, length $data, scalar @{$av || []};#d# 1076 $filename, length $data, scalar @{$av || []};
1077
811 return ($data, $av); 1078 ($data, $av)
812} 1079}
1080
1081=head2 COMMAND CALLBACKS
1082
1083=over 4
1084
1085=cut
813 1086
814############################################################################# 1087#############################################################################
815# command handling &c 1088# command handling &c
816 1089
817=item cf::register_command $name => \&callback($ob,$args); 1090=item cf::register_command $name => \&callback($ob,$args);
830 push @{ $COMMAND{$name} }, [$caller, $cb]; 1103 push @{ $COMMAND{$name} }, [$caller, $cb];
831} 1104}
832 1105
833=item cf::register_extcmd $name => \&callback($pl,$packet); 1106=item cf::register_extcmd $name => \&callback($pl,$packet);
834 1107
835Register a callbackf ro execution when the client sends an extcmd packet. 1108Register a callback for execution when the client sends an (synchronous)
1109extcmd packet. Ext commands will be processed in the order they are
1110received by the server, like other user commands. The first argument is
1111the logged-in player. Ext commands can only be processed after a player
1112has logged in successfully.
836 1113
837If the callback returns something, it is sent back as if reply was being 1114If the callback returns something, it is sent back as if reply was being
838called. 1115called.
839 1116
1117=item cf::register_exticmd $name => \&callback($ns,$packet);
1118
1119Register a callback for execution when the client sends an (asynchronous)
1120exticmd packet. Exti commands are processed by the server as soon as they
1121are received, i.e. out of order w.r.t. other commands. The first argument
1122is a client socket. Exti commands can be received anytime, even before
1123log-in.
1124
1125If the callback returns something, it is sent back as if reply was being
1126called.
1127
840=cut 1128=cut
841 1129
842sub register_extcmd { 1130sub register_extcmd {
843 my ($name, $cb) = @_; 1131 my ($name, $cb) = @_;
844 1132
845 $EXTCMD{$name} = $cb; 1133 $EXTCMD{$name} = $cb;
1134}
1135
1136sub register_exticmd {
1137 my ($name, $cb) = @_;
1138
1139 $EXTICMD{$name} = $cb;
846} 1140}
847 1141
848cf::player->attach ( 1142cf::player->attach (
849 on_command => sub { 1143 on_command => sub {
850 my ($pl, $name, $params) = @_; 1144 my ($pl, $name, $params) = @_;
859 cf::override; 1153 cf::override;
860 }, 1154 },
861 on_extcmd => sub { 1155 on_extcmd => sub {
862 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
863 1157
864 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
865 1159
866 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
867 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
868 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
869 $pl->ext_reply ($msg->{msgid}, %reply);
870 }
871 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
872 } else { 1175 } else {
873 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
874 } 1177 }
875 1178
876 cf::override; 1179 cf::override;
877 }, 1180 },
878); 1181);
879 1182
880sub load_extension {
881 my ($path) = @_;
882
883 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
884 my $base = $1;
885 my $pkg = $1;
886 $pkg =~ s/[^[:word:]]/_/g;
887 $pkg = "ext::$pkg";
888
889 warn "... loading '$path' into '$pkg'\n";
890
891 open my $fh, "<:utf8", $path
892 or die "$path: $!";
893
894 my $source =
895 "package $pkg; use strict; use utf8;\n"
896 . "#line 1 \"$path\"\n{\n"
897 . (do { local $/; <$fh> })
898 . "\n};\n1";
899
900 unless (eval $source) {
901 my $msg = $@ ? "$path: $@\n"
902 : "extension disabled.\n";
903 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
904 warn $@;
905 warn "mandatory extension failed to load, exiting.\n";
906 exit 1;
907 }
908 die $@;
909 }
910
911 push @EXTS, $pkg;
912}
913
914sub load_extensions { 1183sub load_extensions {
1184 cf::sync_job {
1185 my %todo;
1186
915 for my $ext (<$LIBDIR/*.ext>) { 1187 for my $path (<$LIBDIR/*.ext>) {
916 next unless -r $ext; 1188 next unless -r $path;
917 eval { 1189
918 load_extension $ext; 1190 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1191 my $base = $1;
1192 my $pkg = $1;
1193 $pkg =~ s/[^[:word:]]/_/g;
1194 $pkg = "ext::$pkg";
1195
1196 open my $fh, "<:utf8", $path
1197 or die "$path: $!";
1198
1199 my $source = do { local $/; <$fh> };
1200
1201 my %ext = (
1202 path => $path,
1203 base => $base,
1204 pkg => $pkg,
1205 );
1206
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209
1210 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n"
1213 . $source
1214 . "\n};\n1";
1215
1216 $todo{$base} = \%ext;
1217 }
1218
1219 my %done;
1220 while (%todo) {
1221 my $progress;
1222
1223 while (my ($k, $v) = each %todo) {
1224 for (split /,\s*/, $v->{meta}{depends}) {
1225 goto skip
1226 unless exists $done{$_};
1227 }
1228
1229 warn "... loading '$k' into '$v->{pkg}'\n";
1230
1231 unless (eval $v->{source}) {
1232 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n";
1234
1235 if (exists $v->{meta}{mandatory}) {
1236 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n";
1238 exit 1;
1239 }
1240
1241 warn $msg;
1242 }
1243
1244 $done{$k} = delete $todo{$k};
1245 push @EXTS, $v->{pkg};
1246 $progress = 1;
919 1 1247 }
920 } or warn "$ext not loaded: $@"; 1248
1249 skip:
1250 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1251 unless $progress;
1252 }
921 } 1253 };
922} 1254}
923 1255
924############################################################################# 1256#############################################################################
925 1257
1258=back
1259
926=head2 CORE EXTENSIONS 1260=head2 CORE EXTENSIONS
927 1261
928Functions and methods that extend core crossfire objects. 1262Functions and methods that extend core crossfire objects.
929 1263
930=cut 1264=cut
942Returns the given player object, loading it if necessary (might block). 1276Returns the given player object, loading it if necessary (might block).
943 1277
944=cut 1278=cut
945 1279
946sub playerdir($) { 1280sub playerdir($) {
947 cf::localdir 1281 "$PLAYERDIR/"
948 . "/"
949 . cf::playerdir
950 . "/"
951 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1282 . (ref $_[0] ? $_[0]->ob->name : $_[0])
952} 1283}
953 1284
954sub path($) { 1285sub path($) {
955 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1286 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956 1287
957 (playerdir $login) . "/$login.pl" 1288 (playerdir $login) . "/playerdata"
958} 1289}
959 1290
960sub find_active($) { 1291sub find_active($) {
961 $cf::PLAYER{$_[0]} 1292 $cf::PLAYER{$_[0]}
962 and $cf::PLAYER{$_[0]}->active 1293 and $cf::PLAYER{$_[0]}->active
975 my $login = $_[0]; 1306 my $login = $_[0];
976 1307
977 my $guard = cf::lock_acquire "user_find:$login"; 1308 my $guard = cf::lock_acquire "user_find:$login";
978 1309
979 $cf::PLAYER{$_[0]} || do { 1310 $cf::PLAYER{$_[0]} || do {
980 my $pl = load_pl path $login 1311 # rename old playerfiles to new ones
1312 #TODO: remove when no longer required
1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1316 aio_unlink +(playerdir $login) . "/$login.pl";
1317
1318 my $f = new_from_file cf::object::thawer path $login
981 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
982 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
983 } 1327 }
984 } 1328 }
985} 1329}
986 1330
996 1340
997 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
998 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
999 1343
1000 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1001 Coro::cede; 1345 cf::cede_to_tick;
1002} 1346}
1003 1347
1004sub new($) { 1348sub new($) {
1005 my ($login) = @_; 1349 my ($login) = @_;
1006 1350
1010 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1011 1355
1012 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1013 1357
1014 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1015} 1369}
1016 1370
1017=item $pl->quit_character 1371=item $pl->quit_character
1018 1372
1019Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
1068while and may block, so not sync_job-capable, ever. 1422while and may block, so not sync_job-capable, ever.
1069 1423
1070=cut 1424=cut
1071 1425
1072sub list_logins { 1426sub list_logins {
1073 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1427 my $dirs = aio_readdir $PLAYERDIR
1074 or return []; 1428 or return [];
1075 1429
1076 my @logins; 1430 my @logins;
1077 1431
1078 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1079 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1080 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1081 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1082 1441
1083 utf8::decode $login; 1442 utf8::decode $login;
1084 push @logins, $login; 1443 push @logins, $login;
1085 } 1444 }
1086 1445
1113 } 1472 }
1114 1473
1115 \@paths 1474 \@paths
1116} 1475}
1117 1476
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1478
1479Expand crossfire pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1118=item $player->ext_reply ($msgid, $msgtype, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1119 1529
1120Sends an ext reply to the player. 1530Sends an ext reply to the player.
1121 1531
1122=cut 1532=cut
1123 1533
1124sub ext_reply($$$%) { 1534sub ext_reply($$@) {
1125 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1126 1536
1127 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1128
1129 $self->send ("ext " . cf::to_json \%msg);
1130} 1538}
1131 1539
1132package cf; 1540=item $player->ext_msg ($type, @msg)
1541
1542Sends an ext event to the client.
1543
1544=cut
1545
1546sub ext_msg($$@) {
1547 my ($self, $type, @msg) = @_;
1548
1549 $self->ns->ext_msg ($type, @msg);
1550}
1551
1552=head3 cf::region
1553
1554=over 4
1555
1556=cut
1557
1558package cf::region;
1559
1560=item cf::region::find_by_path $path
1561
1562Tries to decuce the likely region for a map knowing only its path.
1563
1564=cut
1565
1566sub find_by_path($) {
1567 my ($path) = @_;
1568
1569 my ($match, $specificity);
1570
1571 for my $region (list) {
1572 if ($region->{match} && $path =~ $region->{match}) {
1573 ($match, $specificity) = ($region, $region->specificity)
1574 if $region->specificity > $specificity;
1575 }
1576 }
1577
1578 $match
1579}
1133 1580
1134=back 1581=back
1135
1136 1582
1137=head3 cf::map 1583=head3 cf::map
1138 1584
1139=over 4 1585=over 4
1140 1586
1195 my ($self, $merge) = @_; 1641 my ($self, $merge) = @_;
1196 1642
1197 # we have to keep some variables in memory intact 1643 # we have to keep some variables in memory intact
1198 local $self->{path}; 1644 local $self->{path};
1199 local $self->{load_path}; 1645 local $self->{load_path};
1200 local $self->{deny_save};
1201 local $self->{deny_reset};
1202 1646
1203 $self->SUPER::thawer_merge ($merge); 1647 $self->SUPER::thawer_merge ($merge);
1204} 1648}
1205 1649
1206sub normalise { 1650sub normalise {
1253 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1254 return $self; 1698 return $self;
1255 } 1699 }
1256 } 1700 }
1257 1701
1258 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1259 () 1703 ()
1260} 1704}
1261 1705
1262sub init { 1706sub init {
1263 my ($self) = @_; 1707 my ($self) = @_;
1278 1722
1279# the original (read-only) location 1723# the original (read-only) location
1280sub load_path { 1724sub load_path {
1281 my ($self) = @_; 1725 my ($self) = @_;
1282 1726
1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1727 "$MAPDIR/$self->{path}.map"
1284} 1728}
1285 1729
1286# the temporary/swap location 1730# the temporary/swap location
1287sub save_path { 1731sub save_path {
1288 my ($self) = @_; 1732 my ($self) = @_;
1289 1733
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1735 "$TMPDIR/$path.map"
1292} 1736}
1293 1737
1294# the unique path, undef == no special unique path 1738# the unique path, undef == no special unique path
1295sub uniq_path { 1739sub uniq_path {
1296 my ($self) = @_; 1740 my ($self) = @_;
1297 1741
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1743 "$UNIQUEDIR/$path"
1300} 1744}
1301 1745
1302# and all this just because we cannot iterate over 1746# and all this just because we cannot iterate over
1303# all maps in C++... 1747# all maps in C++...
1304sub change_all_map_light { 1748sub change_all_map_light {
1306 1750
1307 $_->change_map_light ($change) 1751 $_->change_map_light ($change)
1308 for grep $_->outdoor, values %cf::MAP; 1752 for grep $_->outdoor, values %cf::MAP;
1309} 1753}
1310 1754
1755sub decay_objects {
1756 my ($self) = @_;
1757
1758 return if $self->{deny_reset};
1759
1760 $self->do_decay_objects;
1761}
1762
1311sub unlink_save { 1763sub unlink_save {
1312 my ($self) = @_; 1764 my ($self) = @_;
1313 1765
1314 utf8::encode (my $save = $self->save_path); 1766 utf8::encode (my $save = $self->save_path);
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1767 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1318 1770
1319sub load_header_from($) { 1771sub load_header_from($) {
1320 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1321 1773
1322 utf8::encode $path; 1774 utf8::encode $path;
1323 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1324 # or return;
1325
1326 $self->_load_header ($path)
1327 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1328 1783
1329 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1330 1785
1331 1 1786 1
1332} 1787}
1371 $self->load_header_orig 1826 $self->load_header_orig
1372 or return; 1827 or return;
1373 $self->prepare_orig; 1828 $self->prepare_orig;
1374 } 1829 }
1375 1830
1831 $self->{deny_reset} = 1
1832 if $self->no_reset;
1833
1834 $self->default_region (cf::region::find_by_path $self->{path})
1835 unless $self->default_region;
1836
1376 1 1837 1
1377} 1838}
1378 1839
1379sub find; 1840sub find;
1380sub find { 1841sub find {
1392 $map->{last_save} = $cf::RUNTIME; 1853 $map->{last_save} = $cf::RUNTIME;
1393 1854
1394 $map->load_header 1855 $map->load_header
1395 or return; 1856 or return;
1396 1857
1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously 1859 # doing this can freeze the server in a sync job, obviously
1399 #$cf::WAIT_FOR_TICK->wait; 1860 #$cf::WAIT_FOR_TICK->wait;
1400 $map->reset; 1861 $map->reset;
1401 undef $guard; 1862 undef $guard;
1402 return find $path; 1863 return find $path;
1413 my ($self) = @_; 1874 my ($self) = @_;
1414 1875
1415 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1416 1877
1417 my $path = $self->{path}; 1878 my $path = $self->{path};
1879
1880 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1419 1882
1883 return unless $self->valid;
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1885
1422 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1423 1887
1424 $self->alloc; 1888 $self->alloc;
1425 1889
1426 $self->pre_load; 1890 $self->pre_load;
1891 cf::cede_to_tick;
1427 1892
1428 $self->_load_objects ($self->{load_path}, 1) 1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1895 $self->_load_objects ($f)
1429 or return; 1896 or return;
1430 1897
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1433 1900
1434 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq; 1902 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1437 $self->clear_unique_items; 1905 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1439 } 1909 }
1440 } 1910 }
1441 1911
1442 Coro::cede; 1912 $f->resolve_delayed_derefs;
1443 1913
1914 cf::cede_to_tick;
1444 # now do the right thing for maps 1915 # now do the right thing for maps
1445 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede;
1452 $self->set_darkness_map;
1453 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1918 unless $self->difficulty;
1455 Coro::cede; 1919 cf::cede_to_tick;
1920
1921 unless ($self->{deny_activate}) {
1922 $self->decay_objects;
1923 $self->fix_auto_apply;
1924 $self->update_buttons;
1925 cf::cede_to_tick;
1926 $self->set_darkness_map;
1927 cf::cede_to_tick;
1456 $self->activate; 1928 $self->activate;
1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1933
1934 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1935 }
1458 1936
1459 $self->post_load; 1937 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1938}
1463 1939
1464sub customise_for { 1940sub customise_for {
1465 my ($self, $ob) = @_; 1941 my ($self, $ob) = @_;
1466 1942
1467 return find "~" . $ob->name . "/" . $self->{path} 1943 return find "~" . $ob->name . "/" . $self->{path}
1468 if $self->per_player; 1944 if $self->per_player;
1469 1945
1946# return find "?party/" . $ob->name . "/" . $self->{path}
1947# if $self->per_party;
1948
1470 $self 1949 $self
1471} 1950}
1472 1951
1473# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1474sub load_diag { 1953sub load_neighbours {
1475 my ($map) = @_; 1954 my ($map) = @_;
1476 1955
1477 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1478 1957
1479 for (0 .. 3) { 1958 for (0 .. 3) {
1480 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1481 or next; 1960 or next;
1482 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1483 or next; 1962 or next;
1484 $neigh->load; 1963 $neigh->load;
1485 1964
1965 push @neigh,
1486 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1487 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1488 } 1968 }
1489 1969
1490 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1491 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1492 or next; 1973 or next;
1493 $neigh->load; 1974 $neigh->load;
1494 } 1975 }
1495} 1976}
1496 1977
1501} 1982}
1502 1983
1503sub do_load_sync { 1984sub do_load_sync {
1504 my ($map) = @_; 1985 my ($map) = @_;
1505 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1506 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1507} 1991}
1508 1992
1509our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1510our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1511 1995
1512sub find_async { 1996sub find_async {
1513 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1514 1998
1515 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1516 2000
1517 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1518 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1519 } 2003 }
1520 2004
1521 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1522 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1523 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1524 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1525 my $map = find $path 2010 if (my $map = find $k) {
1526 or next;
1527 $map->load; 2011 $map->load if $v;
2012 }
1528 2013
1529 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1530 } 2015 }
1531 } 2016 }
1532 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1533 }; 2018 };
1534 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
1537} 2022}
1538 2023
1539sub save { 2024sub save {
1540 my ($self) = @_; 2025 my ($self) = @_;
1541 2026
1542 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1543 2028
1544 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1545 2030
1546 return unless $self->dirty; 2031 return unless $self->dirty;
1547 2032
1570 my ($self) = @_; 2055 my ($self) = @_;
1571 2056
1572 # save first because save cedes 2057 # save first because save cedes
1573 $self->save; 2058 $self->save;
1574 2059
1575 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 2061
1577 return if $self->players; 2062 return if $self->players;
1578 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1579 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1580 2065
1584 2069
1585sub reset_at { 2070sub reset_at {
1586 my ($self) = @_; 2071 my ($self) = @_;
1587 2072
1588 # TODO: safety, remove and allow resettable per-player maps 2073 # TODO: safety, remove and allow resettable per-player maps
1589 return 1e99 if $self->isa ("ext::map_per_player");#d#
1590 return 1e99 if $self->{deny_reset}; 2074 return 1e99 if $self->{deny_reset};
1591 2075
1592 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2076 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1593 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2077 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1594 2078
1605 my ($self) = @_; 2089 my ($self) = @_;
1606 2090
1607 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2091 my $lock = cf::lock_acquire "map_data:$self->{path}";
1608 2092
1609 return if $self->players; 2093 return if $self->players;
1610 return if $self->isa ("ext::map_per_player");#d#
1611 2094
1612 warn "resetting map ", $self->path;#d# 2095 warn "resetting map ", $self->path;
1613 2096
1614 $self->in_memory (cf::MAP_SWAPPED); 2097 $self->in_memory (cf::MAP_SWAPPED);
1615 2098
1616 # need to save uniques path 2099 # need to save uniques path
1617 unless ($self->{deny_save}) { 2100 unless ($self->{deny_save}) {
1634my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1635 2118
1636sub nuke { 2119sub nuke {
1637 my ($self) = @_; 2120 my ($self) = @_;
1638 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1639 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1640 2126
1641 $self->unlink_save; 2127 $self->unlink_save;
1642 2128
1643 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1644 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1645 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1646 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1647 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1648 2134
1649 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1650 2137
1651 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2139}
2140
2141=item $maps = cf::map::tmp_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144maps. May block.
2145
2146=cut
2147
2148sub tmp_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise $_
2154 : ()
2155 } @{ aio_readdir $TMPDIR or [] }
2156 ]
2157}
2158
2159=item $maps = cf::map::random_maps
2160
2161Returns an arrayref with all map paths of currently instantiated and saved
2162random maps. May block.
2163
2164=cut
2165
2166sub random_maps() {
2167 [
2168 map {
2169 utf8::decode $_;
2170 /\.map$/
2171 ? normalise "?random/$_"
2172 : ()
2173 } @{ aio_readdir $RANDOMDIR or [] }
2174 ]
1652} 2175}
1653 2176
1654=item cf::map::unique_maps 2177=item cf::map::unique_maps
1655 2178
1656Returns an arrayref of paths of all shared maps that have 2179Returns an arrayref of paths of all shared maps that have
1657instantiated unique items. May block. 2180instantiated unique items. May block.
1658 2181
1659=cut 2182=cut
1660 2183
1661sub unique_maps() { 2184sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2185 [
1663 or return; 2186 map {
1664
1665 my @paths;
1666
1667 for (@$files) {
1668 utf8::decode $_; 2187 utf8::decode $_;
1669 next if /\.pst$/; 2188 /\.map$/
1670 next unless /^$PATH_SEP/o; 2189 ? normalise $_
1671 2190 : ()
1672 push @paths, cf::map::normalise $_; 2191 } @{ aio_readdir $UNIQUEDIR or [] }
1673 } 2192 ]
1674
1675 \@paths
1676} 2193}
1677 2194
1678package cf; 2195package cf;
1679 2196
1680=back 2197=back
1698 map { $_, inv_recursive_ $_->inv } @_ 2215 map { $_, inv_recursive_ $_->inv } @_
1699} 2216}
1700 2217
1701sub inv_recursive { 2218sub inv_recursive {
1702 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2220}
2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
1703} 2251}
1704 2252
1705package cf; 2253package cf;
1706 2254
1707=back 2255=back
1726 2274
1727 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2275 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1728 2276
1729 if ($self->{record_replies}) { 2277 if ($self->{record_replies}) {
1730 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2278 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2279
1731 } else { 2280 } else {
2281 my $pl = $self->contr;
2282
2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2284 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286
2287 } else {
1732 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
1733 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2290 }
1734 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
1735} 2302}
1736 2303
1737=item $player_object->may ("access") 2304=item $player_object->may ("access")
1738 2305
1739Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
1786 $self->deactivate_recursive; 2353 $self->deactivate_recursive;
1787 2354
1788 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2355 return if UNIVERSAL::isa $self->map, "ext::map_link";
1789 2356
1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2357 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1791 if $self->map; 2358 if $self->map && $self->map->{path} ne "{link}";
1792 2359
1793 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2360 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1794} 2361}
1795 2362
1796sub cf::object::player::leave_link { 2363sub cf::object::player::leave_link {
1797 my ($self, $map, $x, $y) = @_; 2364 my ($self, $map, $x, $y) = @_;
2365
2366 return unless $self->contr->active;
1798 2367
1799 my $link_pos = delete $self->{_link_pos}; 2368 my $link_pos = delete $self->{_link_pos};
1800 2369
1801 unless ($map) { 2370 unless ($map) {
1802 # restore original map position 2371 # restore original map position
1816 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
1817 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
1818 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
1819 2388
1820 $map->load; 2389 $map->load;
1821 $map->load_diag; 2390 $map->load_neighbours;
1822 2391
1823 return unless $self->contr->active; 2392 return unless $self->contr->active;
1824 $self->activate_recursive; 2393 $self->activate_recursive;
1825 2394
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
1828} 2397}
1829 2398
1830cf::player->attach ( 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1831 on_logout => sub {
1832 my ($pl) = @_;
1833 2400
1834 # abort map switching before logout 2401Moves the player to the given map-path and coordinates by first freezing
1835 if ($pl->ob->{_link_pos}) { 2402her, loading and preparing them map, calling the provided $check callback
1836 cf::sync_job { 2403that has to return the map if sucecssful, and then unfreezes the player on
1837 $pl->ob->leave_link 2404the new (success) or old (failed) map position. In either case, $done will
1838 }; 2405be called at the end of this process.
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843 2406
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y)
1863
1864=cut 2407=cut
2408
2409our $GOTOGEN;
1865 2410
1866sub cf::object::player::goto { 2411sub cf::object::player::goto {
1867 my ($self, $path, $x, $y) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2413
2414 # do generation counting so two concurrent goto's will be executed in-order
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1868 2416
1869 $self->enter_link; 2417 $self->enter_link;
1870 2418
1871 (async { 2419 (async {
1872 my $map = eval { 2420 my $map = eval {
1873 my $map = cf::map::find $path; 2421 my $map = cf::map::find $path;
2422
2423 if ($map) {
1874 $map = $map->customise_for ($self) if $map; 2424 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map;
2426 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2428 }
2429
1875 $map 2430 $map
2431 };
2432
2433 if ($@) {
2434 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2435 LOG llevError | logBacktrace, Carp::longmess $@;
1876 } or 2436 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 2437
2438 if ($gen == $self->{_goto_generation}) {
2439 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2441 }
2442
2443 $done->() if $done;
1880 })->prio (1); 2444 })->prio (1);
1881} 2445}
1882 2446
1883=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
1884 2448
1923 2487
1924 $rmp->{random_seed} ||= $exit->random_seed; 2488 $rmp->{random_seed} ||= $exit->random_seed;
1925 2489
1926 my $data = cf::to_json $rmp; 2490 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2491 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2492 my $meta = "$RANDOMDIR/$md5.meta";
1929 2493
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2495 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2496 undef $fh;
1933 aio_rename "$meta~", $meta; 2497 aio_rename "$meta~", $meta;
1942 2506
1943 return unless $self->type == cf::PLAYER; 2507 return unless $self->type == cf::PLAYER;
1944 2508
1945 if ($exit->slaying eq "/!") { 2509 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2510 #TODO: this should de-fi-ni-te-ly not be a sync-job
2511 # the problem is that $exit might not survive long enough
2512 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2513 cf::sync_job { prepare_random_map $exit };
1948 } 2514 }
1949 2515
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
1953 2519
1954 $self->enter_link; 2520 $self->enter_link;
2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
1955 2525
1956 (async { 2526 (async {
1957 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
1958 unless (eval { 2528 unless (eval {
1959 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
1960 2530
1961 1; 2531 1;
1962 }) { 2532 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2533 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2534 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2535 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2536 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2537
1968 warn "ERROR in enter_exit: $@"; 2538 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2539 $self->leave_link;
1970 } 2540 }
1971 })->prio (1); 2541 })->prio (1);
1987 2557
1988 utf8::encode $text; 2558 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2560}
1991 2561
2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2563
2564Send a drawinfo or msg packet to the client, formatting the msg for the
2565client if neccessary. C<$type> should be a string identifying the type of
2566the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet.
2568
2569=cut
2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2586sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_;
2588
2589 $msg = $self->pl->expand_cfpod ($msg);
2590
2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2607 return unless @extra || length $msg;
2608
2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2616 } else {
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 }
2641}
2642
2643=item $client->ext_msg ($type, @msg)
2644
2645Sends an ext event to the client.
2646
2647=cut
2648
2649sub cf::client::ext_msg($$@) {
2650 my ($self, $type, @msg) = @_;
2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2655 push @msg, msgtype => "event_$type";
2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2676}
1992 2677
1993=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
1994 2679
1995Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2681the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1997C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2682C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1998 2683
1999Queries can fail, so check the return code. Or don't, as queries will become 2684Queries can fail, so check the return code. Or don't, as queries will
2000reliable at some point in the future. 2685become reliable at some point in the future.
2001 2686
2002=cut 2687=cut
2003 2688
2004sub cf::client::query { 2689sub cf::client::query {
2005 my ($self, $flags, $text, $cb) = @_; 2690 my ($self, $flags, $text, $cb) = @_;
2013 utf8::encode $text; 2698 utf8::encode $text;
2014 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2699 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2015 2700
2016 $self->send_packet ($self->{query_queue}[0][0]) 2701 $self->send_packet ($self->{query_queue}[0][0])
2017 if @{ $self->{query_queue} } == 1; 2702 if @{ $self->{query_queue} } == 1;
2703
2704 1
2018} 2705}
2019 2706
2020cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2021 on_reply => sub { 2713 on_reply => sub {
2022 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2023 2715
2024 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2025 # get handled first 2717 # get handled first
2037 } else { 2729 } else {
2038 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2730 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2039 } 2731 }
2040 } 2732 }
2041 }, 2733 },
2734 on_exticmd => sub {
2735 my ($ns, $buf) = @_;
2736
2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2738
2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2747 if (my $cb = $EXTICMD{$type}) {
2748 @reply = $cb->($ns, @payload);
2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2754 } else {
2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2756 }
2757
2758 cf::override;
2759 },
2042); 2760);
2043 2761
2044=item $client->async (\&cb) 2762=item $client->async (\&cb)
2045 2763
2046Create a new coroutine, running the specified callback. The coroutine will 2764Create a new coroutine, running the specified callback. The coroutine will
2087our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2088our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2089 2807
2090$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2091 2809
2092$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2093 2815
2094# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2095 2817
2096=pod 2818=pod
2097 2819
2098The following fucntions and emthods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2099 2821
2100 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2101 cf::object::player player 2826 cf::object::player
2102 cf::player peaceful 2827 player
2103 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2104 2834
2105=cut 2835=cut
2106 2836
2107for ( 2837for (
2108 ["cf::object" => qw(contr pay_amount pay_player map)], 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2840 decrease_ob_nr)],
2109 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2110 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2111 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2112) { 2844) {
2113 no strict 'refs'; 2845 no strict 'refs';
2184=back 2916=back
2185 2917
2186=cut 2918=cut
2187 2919
2188############################################################################# 2920#############################################################################
2189
2190=head2 EXTENSION DATABASE SUPPORT
2191
2192Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which
2194excludes objects.
2195
2196The parameter C<$family> should best start with the name of the extension
2197using it, it should be unique.
2198
2199=over 4
2200
2201=item $value = cf::db_get $family => $key
2202
2203Returns a single value from the database.
2204
2205=item cf::db_put $family => $key => $value
2206
2207Stores the given C<$value> in the family.
2208
2209=cut
2210
2211our $DB;
2212
2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions 2921# the server's init and main functions
2262 2922
2263sub load_faces { 2923sub load_facedata($) {
2264 my $path = sprintf "%s/faces", cf::datadir; 2924 my ($path) = @_;
2265 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2266 warn "loading faces from $path\n"; 2932 warn "loading facedata from $path\n";
2267 2933
2268 my $faces; 2934 my $facedata;
2269 0 < aio_load $path, $faces 2935 0 < aio_load $path, $facedata
2270 or die "$path: $!"; 2936 or die "$path: $!";
2271 2937
2272 Coro::cede;
2273 $faces = Storable::thaw $faces; 2938 $facedata = Coro::Storable::thaw $facedata;
2274 Coro::cede;
2275 2939
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1 2940 $facedata->{version} == 2
2278 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279 2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2949
2950 {
2951 my $faces = $facedata->{faceinfo};
2952
2280 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2284 Coro::cede; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2285 }
2286 2959
2960 cf::cede_to_tick;
2961 }
2962
2287 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2289 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2290 or next; 2966 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth; 2968 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2293 } else { 2970 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 } 2972 }
2296 Coro::cede; 2973
2974 cf::cede_to_tick;
2975 }
2976 }
2977
2978 {
2979 my $anims = $facedata->{animinfo};
2980
2981 while (my ($anim, $info) = each %$anims) {
2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2983 cf::cede_to_tick;
2984 }
2985
2986 cf::anim::invalidate_all; # d'oh
2987 }
2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
2297 } 3036 }
2298 3037
2299 1 3038 1
2300} 3039}
2301 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
3054 load_resource_file "$MAPDIR/regions"
3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
3061}
3062
3063sub reload_facedata {
3064 load_facedata "$DATADIR/facedata"
3065 or die "unable to load facedata\n";
3066}
3067
3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
3076}
3077
3078sub reload_treasures {
3079 load_resource_file "$DATADIR/treasures"
3080 or die "unable to load treasurelists\n";
3081}
3082
2302sub reload_resources { 3083sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3084 warn "reloading resource files...\n";
2304 or die "unable to load regions file\n";#d# 3085
3086 reload_regions;
2305 load_faces 3087 reload_facedata;
2306 or die "unable to load faces\n";#d# 3088 #reload_archetypes;#d#
3089 reload_archetypes;
3090 reload_treasures;
3091
3092 warn "finished reloading resource files\n";
2307} 3093}
2308 3094
2309sub init { 3095sub init {
2310 reload_resources; 3096 reload_resources;
2311} 3097}
2312 3098
2313sub cfg_load { 3099sub reload_config {
2314 open my $fh, "<:utf8", cf::confdir . "/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2315 or return; 3101 or return;
2316 3102
2317 local $/; 3103 local $/;
2318 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
2319 3105
2338 (async { 3124 (async {
2339 Event::one_event; 3125 Event::one_event;
2340 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2341 }; 3127 };
2342 3128
2343 cfg_load; 3129 reload_config;
2344 db_init; 3130 db_init;
2345 load_extensions; 3131 load_extensions;
2346 3132
2347 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2348 Event::loop; 3134 Event::loop;
2364 }, 3150 },
2365 ); 3151 );
2366 } 3152 }
2367} 3153}
2368 3154
3155sub write_runtime {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time.
3160
3161 IO::AIO::aio_utime $runtime, undef, undef;
3162
3163 my $guard = cf::lock_acquire "write_runtime";
3164
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3166 or return;
3167
3168 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server.
3171
3172 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3173 and return;
3174
3175 # always fsync - this file is important
3176 aio_fsync $fh
3177 and return;
3178
3179 # touch it again to show we are up-to-date
3180 aio_utime $fh, undef, undef;
3181
3182 close $fh
3183 or return;
3184
3185 aio_rename "$runtime~", $runtime
3186 and return;
3187
3188 warn "runtime file written.\n";
3189
3190 1
3191}
3192
2369sub emergency_save() { 3193sub emergency_save() {
2370 my $freeze_guard = cf::freeze_mainloop; 3194 my $freeze_guard = cf::freeze_mainloop;
2371 3195
2372 warn "enter emergency perl save\n"; 3196 warn "enter emergency perl save\n";
2373 3197
2404 3228
2405 warn Carp::longmess "post_cleanup backtrace" 3229 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core; 3230 if $make_core;
2407} 3231}
2408 3232
2409sub reload() { 3233sub do_reload_perl() {
2410 # can/must only be called in main 3234 # can/must only be called in main
2411 if ($Coro::current != $Coro::main) { 3235 if ($Coro::current != $Coro::main) {
2412 warn "can only reload from main coroutine"; 3236 warn "can only reload from main coroutine";
2413 return; 3237 return;
2414 } 3238 }
2448 %EXT_CORO = (); 3272 %EXT_CORO = ();
2449 3273
2450 warn "removing commands"; 3274 warn "removing commands";
2451 %COMMAND = (); 3275 %COMMAND = ();
2452 3276
2453 warn "removing ext commands"; 3277 warn "removing ext/exti commands";
2454 %EXTCMD = (); 3278 %EXTCMD = ();
3279 %EXTICMD = ();
2455 3280
2456 warn "unloading/nuking all extensions"; 3281 warn "unloading/nuking all extensions";
2457 for my $pkg (@EXTS) { 3282 for my $pkg (@EXTS) {
2458 warn "... unloading $pkg"; 3283 warn "... unloading $pkg";
2459 3284
2489 Symbol::delete_package "safe::$_" 3314 Symbol::delete_package "safe::$_"
2490 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3315 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2491 3316
2492 warn "unloading cf.pm \"a bit\""; 3317 warn "unloading cf.pm \"a bit\"";
2493 delete $INC{"cf.pm"}; 3318 delete $INC{"cf.pm"};
3319 delete $INC{"cf/pod.pm"};
2494 3320
2495 # don't, removes xs symbols, too, 3321 # don't, removes xs symbols, too,
2496 # and global variables created in xs 3322 # and global variables created in xs
2497 #Symbol::delete_package __PACKAGE__; 3323 #Symbol::delete_package __PACKAGE__;
2498 3324
2501 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2502 require cf; 3328 require cf;
2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2504 3330
2505 warn "loading config and database again"; 3331 warn "loading config and database again";
2506 cf::cfg_load; 3332 cf::reload_config;
2507 3333
2508 warn "loading extensions"; 3334 warn "loading extensions";
2509 cf::load_extensions; 3335 cf::load_extensions;
2510 3336
2511 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
2513 warn "reattaching attachments to maps"; 3339 warn "reattaching attachments to maps";
2514 reattach $_ for values %MAP; 3340 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players"; 3341 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER; 3342 reattach $_ for values %PLAYER;
2517 3343
2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job"; 3344 warn "leaving sync_job";
2522 3345
2523 1 3346 1
2524 } or do { 3347 } or do {
2525 warn $@; 3348 warn $@;
2530 warn "reloaded"; 3353 warn "reloaded";
2531}; 3354};
2532 3355
2533our $RELOAD_WATCHER; # used only during reload 3356our $RELOAD_WATCHER; # used only during reload
2534 3357
3358sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here.
3361
3362 $RELOAD_WATCHER ||= Event->timer (
3363 reentrant => 0,
3364 after => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => sub {
3367 do_reload_perl;
3368 undef $RELOAD_WATCHER;
3369 },
3370 );
3371}
3372
2535register_command "reload" => sub { 3373register_command "reload" => sub {
2536 my ($who, $arg) = @_; 3374 my ($who, $arg) = @_;
2537 3375
2538 if ($who->flag (FLAG_WIZ)) { 3376 if ($who->flag (FLAG_WIZ)) {
2539 $who->message ("reloading server."); 3377 $who->message ("reloading server.");
2540 3378 async { reload_perl };
2541 # doing reload synchronously and two reloads happen back-to-back,
2542 # coro crashes during coro_state_free->destroy here.
2543
2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2549 reload;
2550 undef $RELOAD_WATCHER;
2551 },
2552 );
2553 } 3379 }
2554}; 3380};
2555 3381
2556unshift @INC, $LIBDIR; 3382unshift @INC, $LIBDIR;
2557 3383
2558my $bug_warning = 0; 3384my $bug_warning = 0;
2559 3385
3386our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN;
3388
3389sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active;
3391 return if $Coro::current == $Coro::main;
3392
3393 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait;
3396}
3397
3398sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active;
3400 return if $Coro::current == $Coro::main;
3401
3402 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait;
3405}
3406
3407 my $min = 1e6;#d#
3408 my $avg = 10;
2560$TICK_WATCHER = Event->timer ( 3409$TICK_WATCHER = Event->timer (
2561 reentrant => 0, 3410 reentrant => 0,
2562 parked => 1, 3411 parked => 1,
2563 prio => 0, 3412 prio => 0,
2564 at => $NEXT_TICK || $TICK, 3413 at => $NEXT_TICK || $TICK,
2568 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2569 unless ++$bug_warning > 10; 3418 unless ++$bug_warning > 10;
2570 return; 3419 return;
2571 } 3420 }
2572 3421
2573 $NOW = Event::time; 3422 $NOW = $tick_start = Event::time;
2574 3423
2575 cf::server_tick; # one server iteration 3424 cf::server_tick; # one server iteration
3425
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
2576 $RUNTIME += $TICK; 3449 $RUNTIME += $TICK;
2577 $NEXT_TICK += $TICK; 3450 $NEXT_TICK += $TICK;
2578 3451
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10; 3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
2582 write_runtime 3455 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!"; 3456 or warn "ERROR: unable to write runtime file: $!";
2584 }; 3457 };
2585 } 3458 }
2586 3459
2587 $WAIT_FOR_TICK->broadcast;
2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time; 3460# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d# 3461# warn $AFTER - $NOW;#d#
2592 3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send;
3465 }
3466 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send;
3468 }
3469
3470 $NOW = Event::time;
3471
2593 # if we are delayed by four ticks or more, skip them all 3472 # if we are delayed by four ticks or more, skip them all
2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2595 3474
2596 $TICK_WATCHER->at ($NEXT_TICK); 3475 $TICK_WATCHER->at ($NEXT_TICK);
2597 $TICK_WATCHER->start; 3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480
3481 _post_tick;
3482
3483
2598 }, 3484 },
2599); 3485);
2600 3486
2601{ 3487{
2602 BDB::max_poll_time $TICK * 0.1; 3488 BDB::max_poll_time $TICK * 0.1;
2630 3516
2631 cf::sync_job { 3517 cf::sync_job {
2632 eval { 3518 eval {
2633 BDB::db_env_open 3519 BDB::db_env_open
2634 $DB_ENV, 3520 $DB_ENV,
2635 $BDB_ENV_DIR, 3521 $BDBDIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666; 3524 0666;
2639 3525
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2641 3527
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect; 3529 $DB_ENV->set_lk_detect;
2644 }; 3530 };
2645 3531
2661 prio => 6, 3547 prio => 6,
2662 cb => \&IO::AIO::poll_cb, 3548 cb => \&IO::AIO::poll_cb,
2663 ); 3549 );
2664} 3550}
2665 3551
3552my $_log_backtrace;
3553
3554sub _log_backtrace {
3555 my ($msg, @addr) = @_;
3556
3557 $msg =~ s/\n//;
3558
3559 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace;
3562 async {
3563 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!";
3568
3569 my @funcs;
3570 my @res = <$fh>;
3571 chomp for @res;
3572 while (@res) {
3573 my ($func, $line) = splice @res, 0, 2, ();
3574 push @funcs, "[$func] $line";
3575 }
3576
3577 @funcs
3578 };
3579
3580 LOG llevInfo, "[ABT] $msg\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace;
3583 };
3584 } else {
3585 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n";
3587 }
3588}
3589
3590# load additional modules
3591use cf::pod;
3592
2666END { cf::emergency_save } 3593END { cf::emergency_save }
2667 3594
26681 35951
2669 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines