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.240 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.312 by root, Sat Jul 21 18:01:26 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.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
22 24
25use JSON::XS 1.4 ();
23use BDB (); 26use BDB ();
24use Data::Dumper; 27use Data::Dumper;
25use Digest::MD5; 28use Digest::MD5;
26use Fcntl; 29use Fcntl;
27use YAML::Syck (); 30use YAML::Syck ();
28use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
29use Time::HiRes; 32use Time::HiRes;
30use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
31 35
32# configure various modules to our taste 36# configure various modules to our taste
33# 37#
34$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 51our %COMMAND = ();
48our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
49 53
50our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
54 59
55our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
56our @EVENT; 61our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 62
59our $TICK = MAX_TIME * 1e-6; 63our $CONFDIR = confdir;
64our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db";
74
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 76our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 79our $NEXT_TICK;
64our $NOW; 80our $NOW;
73our $RUNTIME; 89our $RUNTIME;
74 90
75our %PLAYER; # all users 91our %PLAYER; # all users
76our %MAP; # all maps 92our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 94
81# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
84binmode STDOUT; 102binmode STDOUT;
85binmode STDERR; 103binmode STDERR;
86 104
87# read virtual server time, if available 105# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
92} 110}
93 111
94mkdir cf::localdir; 112mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 114
101our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
102 116
103sub cf::map::normalise; 117sub cf::map::normalise;
104 118
115=item $cf::RUNTIME 129=item $cf::RUNTIME
116 130
117The time this server has run, starts at 0 and is increased by $cf::TICK on 131The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 132every server tick.
119 133
120=item $cf::LIBDIR 134=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
135$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
136$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 137
122The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 139directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and
141database environment.
124 142
125=item $cf::NOW 143=item $cf::NOW
126 144
127The time of the last (current) server tick. 145The time of the last (current) server tick.
128 146
129=item $cf::TICK 147=item $cf::TICK
130 148
131The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
132 160
133=item %cf::CFG 161=item %cf::CFG
134 162
135Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 164from wherever your confdir points to.
139 167
140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
141returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
142per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
143 171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
177
144=back 178=back
145 179
146=cut 180=cut
147 181
148BEGIN { 182BEGIN {
149 *CORE::GLOBAL::warn = sub { 183 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 184 my $msg = join "", @_;
151 utf8::encode $msg;
152 185
153 $msg .= "\n" 186 $msg .= "\n"
154 unless $msg =~ /\n$/; 187 unless $msg =~ /\n$/;
155 188
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190
191 utf8::encode $msg;
156 LOG llevError, $msg; 192 LOG llevError, $msg;
157 }; 193 };
158} 194}
159 195
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 203
167# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 205# within the Safe compartment.
169for my $pkg (qw( 206for my $pkg (qw(
170 cf::global cf::attachable 207 cf::global cf::attachable
178} 215}
179 216
180$Event::DIED = sub { 217$Event::DIED = sub {
181 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
182}; 219};
220
221#############################################################################
183 222
184=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
185 224
186=over 4 225=over 4
187 226
206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
207 $d 246 $d
208 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
209} 248}
210 249
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
214 251
215Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
216 253
217=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
218 255
219Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
220 264
221=item cf::lock_wait $string 265=item cf::lock_wait $string
222 266
223Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
224 268
230returned. 274returned.
231 275
232Lock names should begin with a unique identifier (for example, cf::map::find 276Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 277uses map_find and cf::map::load uses map_load).
234 278
279=item $locked = cf::lock_active $string
280
281Return true if the lock is currently active, i.e. somebody has locked it.
282
235=cut 283=cut
236 284
237our %LOCK; 285our %LOCK;
238 286
239sub lock_wait($) { 287sub lock_wait($) {
256 304
257 Coro::guard { 305 Coro::guard {
258 # wake up all waiters, to be on the safe side 306 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 307 $_->ready for @{ delete $LOCK{$key} };
260 } 308 }
309}
310
311sub lock_active($) {
312 my ($key) = @_;
313
314 ! ! $LOCK{$key}
261} 315}
262 316
263sub freeze_mainloop { 317sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 318 return unless $TICK_WATCHER->is_active;
265 319
280 334
281BEGIN { *async = \&Coro::async_pool } 335BEGIN { *async = \&Coro::async_pool }
282 336
283=item cf::sync_job { BLOCK } 337=item cf::sync_job { BLOCK }
284 338
285The design of crossfire+ requires that the main coro ($Coro::main) is 339The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 340is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable.
288 343
289If it must be done, put the blocking parts into C<sync_job>. This will run 344If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 345the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 346server will be frozen during this time, so the block should either finish
292fast or be very important. 347fast or be very important.
295 350
296sub sync_job(&) { 351sub sync_job(&) {
297 my ($job) = @_; 352 my ($job) = @_;
298 353
299 if ($Coro::current == $Coro::main) { 354 if ($Coro::current == $Coro::main) {
355 my $time = Event::time;
356
300 # this is the main coro, too bad, we have to block 357 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 358 # till the operation succeeds, freezing the server :/
302 359
303 # TODO: use suspend/resume instead 360 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 361 # (but this is cancel-safe)
315 372
316 while ($busy) { 373 while ($busy) {
317 Coro::cede or Event::one_event; 374 Coro::cede or Event::one_event;
318 } 375 }
319 376
377 $time = Event::time - $time;
378
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load
383
320 wantarray ? @res : $res[0] 384 wantarray ? @res : $res[0]
321 } else { 385 } else {
322 # we are in another coroutine, how wonderful, everything just works 386 # we are in another coroutine, how wonderful, everything just works
323 387
324 $job->() 388 $job->()
343 $EXT_CORO{$coro+0} = $coro; 407 $EXT_CORO{$coro+0} = $coro;
344 408
345 $coro 409 $coro
346} 410}
347 411
348sub write_runtime { 412=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 413
351 my $runtime = cf::localdir . "/runtime"; 414Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling.
352 418
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 419=cut
354 or return;
355 420
356 my $value = $cf::RUNTIME + 90 + 10; 421sub _store_scalar {
357 # 10 is the runtime save interval, for a monotonic clock 422 open my $fh, ">", \my $buf
358 # 60 allows for the watchdog to kill the server. 423 or die "fork_call: cannot open fh-to-buf in child : $!";
359 424 Storable::store_fd $_[0], $fh;
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0
361 and return;
362
363 # always fsync - this file is important
364 aio_fsync $fh
365 and return;
366
367 close $fh 425 close $fh;
368 or return;
369 426
370 aio_rename "$runtime~", $runtime 427 $buf
371 and return; 428}
372 429
430sub fork_call(&@) {
431 my ($cb, @args) = @_;
432
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
434# or die "socketpair: $!";
435 pipe my $fh1, my $fh2
436 or die "pipe: $!";
437
438 if (my $pid = fork) {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals;
452 local $SIG{__WARN__};
453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
460 eval {
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
373 1 471 }
472}
473
474=item $value = cf::db_get $family => $key
475
476Returns a single value from the environment database.
477
478=item cf::db_put $family => $key => $value
479
480Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482
483=cut
484
485our $DB;
486
487sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job {
492 eval {
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 }
502}
503
504sub db_get($$) {
505 my $key = "$_[0]/$_[1]";
506
507 cf::sync_job {
508 BDB::db_get $DB, undef, $key, my $data;
509
510 $! ? ()
511 : $data
512 }
513}
514
515sub db_put($$$) {
516 BDB::dbreq_pri 4;
517 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
518}
519
520=item cf::cache $id => [$paths...], $processversion => $process
521
522Generic caching function that returns the value of the resource $id,
523caching and regenerating as required.
524
525This function can block.
526
527=cut
528
529sub cache {
530 my ($id, $src, $processversion, $process) = @_;
531
532 my $meta =
533 join "\x00",
534 $processversion,
535 map {
536 aio_stat $_
537 and Carp::croak "$_: $!";
538
539 ($_, (stat _)[7,9])
540 } @$src;
541
542 my $dbmeta = db_get cache => "$id/meta";
543 if ($dbmeta ne $meta) {
544 # changed, we may need to process
545
546 my @data;
547 my $md5;
548
549 for (0 .. $#$src) {
550 0 <= aio_load $src->[$_], $data[$_]
551 or Carp::croak "$src->[$_]: $!";
552 }
553
554 # if processing is expensive, check
555 # checksum first
556 if (1) {
557 $md5 =
558 join "\x00",
559 $processversion,
560 map {
561 Coro::cede;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src;
564
565
566 my $dbmd5 = db_get cache => "$id/md5";
567 if ($dbmd5 eq $md5) {
568 db_put cache => "$id/meta", $meta;
569
570 return db_get cache => "$id/data";
571 }
572 }
573
574 my $t1 = Time::HiRes::time;
575 my $data = $process->(\@data);
576 my $t2 = Time::HiRes::time;
577
578 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
579
580 db_put cache => "$id/data", $data;
581 db_put cache => "$id/md5" , $md5;
582 db_put cache => "$id/meta", $meta;
583
584 return $data;
585 }
586
587 db_get cache => "$id/data"
374} 588}
375 589
376=item cf::datalog type => key => value, ... 590=item cf::datalog type => key => value, ...
377 591
378Log a datalog packet of the given type with the given key-value pairs. 592Log a datalog packet of the given type with the given key-value pairs.
396attach callbacks/event handlers (a collection of which is called an "attachment") 610attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 611to it. All such attachable objects support the following methods.
398 612
399In the following description, CLASS can be any of C<global>, C<object> 613In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 614C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 615Crossfire TRT).
402 616
403=over 4 617=over 4
404 618
405=item $attachable->attach ($attachment, key => $value...) 619=item $attachable->attach ($attachment, key => $value...)
406 620
569 $registry = $CB_TYPE[$object_type] ||= []; 783 $registry = $CB_TYPE[$object_type] ||= [];
570 784
571 } elsif ($type eq "subtype") { 785 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 786 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 787 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 788 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 789
576 } elsif ($type eq "package") { 790 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 791 my $pkg = shift @arg;
578 792
579 while (my ($name, $id) = each %cb_id) { 793 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 822 _attach $registry, $klass, @attach;
609 } 823 }
610 824
611 $obj->{$name} = \%arg; 825 $obj->{$name} = \%arg;
612 } else { 826 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 827 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 828 }
615 829
616 $obj->{_attachment}{$name} = undef; 830 $obj->{_attachment}{$name} = undef;
617} 831}
618 832
620 if (ref $_[0]) { 834 if (ref $_[0]) {
621 _object_attach @_; 835 _object_attach @_;
622 } else { 836 } else {
623 _attach shift->_attach_registry, @_; 837 _attach shift->_attach_registry, @_;
624 } 838 }
839 _recalc_want;
625}; 840};
626 841
627# all those should be optimised 842# all those should be optimised
628sub cf::attachable::detach { 843sub cf::attachable::detach {
629 my ($obj, $name) = @_; 844 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 847 delete $obj->{_attachment}{$name};
633 reattach ($obj); 848 reattach ($obj);
634 } else { 849 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 850 Carp::croak "cannot, currently, detach class attachments";
636 } 851 }
852 _recalc_want;
637}; 853};
638 854
639sub cf::attachable::attached { 855sub cf::attachable::attached {
640 my ($obj, $name) = @_; 856 my ($obj, $name) = @_;
641 857
656 "; 872 ";
657 die if $@; 873 die if $@;
658} 874}
659 875
660our $override; 876our $override;
661our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
662 878
663sub override { 879sub override {
664 $override = 1; 880 $override = 1;
665 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
666} 882}
667 883
668sub do_invoke { 884sub do_invoke {
669 my $event = shift; 885 my $event = shift;
670 my $callbacks = shift; 886 my $callbacks = shift;
671 887
672 @invoke_results = (); 888 @INVOKE_RESULTS = ();
673 889
674 local $override; 890 local $override;
675 891
676 for (@$callbacks) { 892 for (@$callbacks) {
677 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
694 910
695Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
696 912
697This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
698removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
699results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 916
701=back 917=back
702 918
703=cut 919=cut
704 920
705############################################################################# 921#############################################################################
706# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
707 934
708sub reattach { 935sub reattach {
709 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 937 my ($obj) = @_;
711 938
814 or return; 1041 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1042 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1043 }
817 1044
818 warn sprintf "loading %s (%d)\n", 1045 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1046 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1047 return ($data, $av);
821} 1048}
1049
1050=head2 COMMAND CALLBACKS
1051
1052=over 4
1053
1054=cut
822 1055
823############################################################################# 1056#############################################################################
824# command handling &c 1057# command handling &c
825 1058
826=item cf::register_command $name => \&callback($ob,$args); 1059=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1072 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1073}
841 1074
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1075=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1076
844Register a callbackf ro execution when the client sends an extcmd packet. 1077Register a callback for execution when the client sends an (synchronous)
1078extcmd packet. Ext commands will be processed in the order they are
1079received by the server, like other user commands. The first argument is
1080the logged-in player. Ext commands can only be processed after a player
1081has logged in successfully.
845 1082
846If the callback returns something, it is sent back as if reply was being 1083If the callback returns something, it is sent back as if reply was being
847called. 1084called.
848 1085
1086=item cf::register_exticmd $name => \&callback($ns,$packet);
1087
1088Register a callback for execution when the client sends an (asynchronous)
1089exticmd packet. Exti commands are processed by the server as soon as they
1090are received, i.e. out of order w.r.t. other commands. The first argument
1091is a client socket. Exti commands can be received anytime, even before
1092log-in.
1093
1094If the callback returns something, it is sent back as if reply was being
1095called.
1096
849=cut 1097=cut
850 1098
851sub register_extcmd { 1099sub register_extcmd {
852 my ($name, $cb) = @_; 1100 my ($name, $cb) = @_;
853 1101
854 $EXTCMD{$name} = $cb; 1102 $EXTCMD{$name} = $cb;
1103}
1104
1105sub register_exticmd {
1106 my ($name, $cb) = @_;
1107
1108 $EXTICMD{$name} = $cb;
855} 1109}
856 1110
857cf::player->attach ( 1111cf::player->attach (
858 on_command => sub { 1112 on_command => sub {
859 my ($pl, $name, $params) = @_; 1113 my ($pl, $name, $params) = @_;
868 cf::override; 1122 cf::override;
869 }, 1123 },
870 on_extcmd => sub { 1124 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
872 1126
873 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1128
875 if (ref $msg) { 1129 if (ref $msg) {
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
877 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
878 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
884 1138
885 cf::override; 1139 cf::override;
886 }, 1140 },
887); 1141);
888 1142
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1143sub load_extensions {
1144 cf::sync_job {
1145 my %todo;
1146
924 for my $ext (<$LIBDIR/*.ext>) { 1147 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1148 next unless -r $path;
926 eval { 1149
927 load_extension $ext; 1150 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1151 my $base = $1;
1152 my $pkg = $1;
1153 $pkg =~ s/[^[:word:]]/_/g;
1154 $pkg = "ext::$pkg";
1155
1156 open my $fh, "<:utf8", $path
1157 or die "$path: $!";
1158
1159 my $source = do { local $/; <$fh> };
1160
1161 my %ext = (
1162 path => $path,
1163 base => $base,
1164 pkg => $pkg,
1165 );
1166
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169
1170 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n"
1173 . $source
1174 . "\n};\n1";
1175
1176 $todo{$base} = \%ext;
1177 }
1178
1179 my %done;
1180 while (%todo) {
1181 my $progress;
1182
1183 while (my ($k, $v) = each %todo) {
1184 for (split /,\s*/, $v->{meta}{depends}) {
1185 goto skip
1186 unless exists $done{$_};
1187 }
1188
1189 warn "... loading '$k' into '$v->{pkg}'\n";
1190
1191 unless (eval $v->{source}) {
1192 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n";
1194
1195 if (exists $v->{meta}{mandatory}) {
1196 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n";
1198 exit 1;
1199 }
1200
1201 warn $msg;
1202 }
1203
1204 $done{$k} = delete $todo{$k};
1205 push @EXTS, $v->{pkg};
1206 $progress = 1;
928 1 1207 }
929 } or warn "$ext not loaded: $@"; 1208
1209 skip:
1210 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1211 unless $progress;
1212 }
930 } 1213 };
931} 1214}
932 1215
933############################################################################# 1216#############################################################################
934 1217
1218=back
1219
935=head2 CORE EXTENSIONS 1220=head2 CORE EXTENSIONS
936 1221
937Functions and methods that extend core crossfire objects. 1222Functions and methods that extend core crossfire objects.
938 1223
939=cut 1224=cut
951Returns the given player object, loading it if necessary (might block). 1236Returns the given player object, loading it if necessary (might block).
952 1237
953=cut 1238=cut
954 1239
955sub playerdir($) { 1240sub playerdir($) {
956 cf::localdir 1241 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1242 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1243}
962 1244
963sub path($) { 1245sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1246 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1084while and may block, so not sync_job-capable, ever. 1366while and may block, so not sync_job-capable, ever.
1085 1367
1086=cut 1368=cut
1087 1369
1088sub list_logins { 1370sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1371 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1372 or return [];
1091 1373
1092 my @logins; 1374 my @logins;
1093 1375
1094 for my $login (@$dirs) { 1376 for my $login (@$dirs) {
1129 } 1411 }
1130 1412
1131 \@paths 1413 \@paths
1132} 1414}
1133 1415
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1417
1418Expand crossfire pod fragments into protocol xml.
1419
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1134=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1135 1467
1136Sends an ext reply to the player. 1468Sends an ext reply to the player.
1137 1469
1138=cut 1470=cut
1139 1471
1140sub ext_reply($$%) { 1472sub ext_reply($$%) {
1141 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1142 1474
1143 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1144 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1477}
1147 1478
1148=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1149 1480
1150Sends an ext event to the client. 1481Sends an ext event to the client.
1165 1496
1166package cf::region; 1497package cf::region;
1167 1498
1168=item cf::region::find_by_path $path 1499=item cf::region::find_by_path $path
1169 1500
1170Tries to decuce the probable region for a map knowing only its path. 1501Tries to decuce the likely region for a map knowing only its path.
1171 1502
1172=cut 1503=cut
1173 1504
1174sub find_by_path($) { 1505sub find_by_path($) {
1175 my ($path) = @_; 1506 my ($path) = @_;
1176 1507
1177 my ($match, $specificity); 1508 my ($match, $specificity);
1178 1509
1179 for my $region (list) { 1510 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1183 } 1514 }
1184 } 1515 }
1185 1516
1249 my ($self, $merge) = @_; 1580 my ($self, $merge) = @_;
1250 1581
1251 # we have to keep some variables in memory intact 1582 # we have to keep some variables in memory intact
1252 local $self->{path}; 1583 local $self->{path};
1253 local $self->{load_path}; 1584 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1585
1257 $self->SUPER::thawer_merge ($merge); 1586 $self->SUPER::thawer_merge ($merge);
1258} 1587}
1259 1588
1260sub normalise { 1589sub normalise {
1307 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1308 return $self; 1637 return $self;
1309 } 1638 }
1310 } 1639 }
1311 1640
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1642 ()
1314} 1643}
1315 1644
1316sub init { 1645sub init {
1317 my ($self) = @_; 1646 my ($self) = @_;
1332 1661
1333# the original (read-only) location 1662# the original (read-only) location
1334sub load_path { 1663sub load_path {
1335 my ($self) = @_; 1664 my ($self) = @_;
1336 1665
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1666 "$MAPDIR/$self->{path}.map"
1338} 1667}
1339 1668
1340# the temporary/swap location 1669# the temporary/swap location
1341sub save_path { 1670sub save_path {
1342 my ($self) = @_; 1671 my ($self) = @_;
1343 1672
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1674 "$TMPDIR/$path.map"
1346} 1675}
1347 1676
1348# the unique path, undef == no special unique path 1677# the unique path, undef == no special unique path
1349sub uniq_path { 1678sub uniq_path {
1350 my ($self) = @_; 1679 my ($self) = @_;
1351 1680
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1682 "$UNIQUEDIR/$path"
1354} 1683}
1355 1684
1356# and all this just because we cannot iterate over 1685# and all this just because we cannot iterate over
1357# all maps in C++... 1686# all maps in C++...
1358sub change_all_map_light { 1687sub change_all_map_light {
1359 my ($change) = @_; 1688 my ($change) = @_;
1360 1689
1361 $_->change_map_light ($change) 1690 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1691 for grep $_->outdoor, values %cf::MAP;
1692}
1693
1694sub decay_objects {
1695 my ($self) = @_;
1696
1697 return if $self->{deny_reset};
1698
1699 $self->do_decay_objects;
1363} 1700}
1364 1701
1365sub unlink_save { 1702sub unlink_save {
1366 my ($self) = @_; 1703 my ($self) = @_;
1367 1704
1425 $self->load_header_orig 1762 $self->load_header_orig
1426 or return; 1763 or return;
1427 $self->prepare_orig; 1764 $self->prepare_orig;
1428 } 1765 }
1429 1766
1767 $self->{deny_reset} = 1
1768 if $self->no_reset;
1769
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1770 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1771 unless $self->default_region;
1432 1772
1433 1 1773 1
1434} 1774}
1449 $map->{last_save} = $cf::RUNTIME; 1789 $map->{last_save} = $cf::RUNTIME;
1450 1790
1451 $map->load_header 1791 $map->load_header
1452 or return; 1792 or return;
1453 1793
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1795 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1796 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1797 $map->reset;
1458 undef $guard; 1798 undef $guard;
1459 return find $path; 1799 return find $path;
1470 my ($self) = @_; 1810 my ($self) = @_;
1471 1811
1472 local $self->{deny_reset} = 1; # loading can take a long time 1812 local $self->{deny_reset} = 1; # loading can take a long time
1473 1813
1474 my $path = $self->{path}; 1814 my $path = $self->{path};
1815
1816 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1817 my $guard = cf::lock_acquire "map_load:$path";
1476 1818
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1819 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1820
1479 $self->in_memory (cf::MAP_LOADING); 1821 $self->in_memory (cf::MAP_LOADING);
1480 1822
1481 $self->alloc; 1823 $self->alloc;
1482 1824
1483 $self->pre_load; 1825 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1826 Coro::cede;
1510 $self->set_darkness_map; 1827
1828 $self->_load_objects ($self->{load_path}, 1)
1829 or return;
1830
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original};
1833
1834 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) {
1837 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0);
1839 }
1840 }
1841
1842 Coro::cede;
1843 # now do the right thing for maps
1844 $self->link_multipart_objects;
1511 $self->difficulty ($self->estimate_difficulty) 1845 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1846 unless $self->difficulty;
1513 Coro::cede; 1847 Coro::cede;
1848
1849 unless ($self->{deny_activate}) {
1850 $self->decay_objects;
1851 $self->fix_auto_apply;
1852 $self->update_buttons;
1853 Coro::cede;
1854 $self->set_darkness_map;
1855 Coro::cede;
1514 $self->activate; 1856 $self->activate;
1515 Coro::cede; 1857 }
1858
1859 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1860 }
1517 1861
1518 $self->post_load; 1862 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1863}
1523 1864
1524sub customise_for { 1865sub customise_for {
1525 my ($self, $ob) = @_; 1866 my ($self, $ob) = @_;
1526 1867
1527 return find "~" . $ob->name . "/" . $self->{path} 1868 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1869 if $self->per_player;
1870
1871# return find "?party/" . $ob->name . "/" . $self->{path}
1872# if $self->per_party;
1529 1873
1530 $self 1874 $self
1531} 1875}
1532 1876
1533# find and load all maps in the 3x3 area around a map 1877# find and load all maps in the 3x3 area around a map
1580 1924
1581 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1582 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1585 my $map = find $path 1929 if (my $map = find $path) {
1586 or next;
1587 $map->load; 1930 $map->load;
1931 }
1588 1932
1589 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1590 } 1934 }
1591 } 1935 }
1592 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
1644 1988
1645sub reset_at { 1989sub reset_at {
1646 my ($self) = @_; 1990 my ($self) = @_;
1647 1991
1648 # TODO: safety, remove and allow resettable per-player maps 1992 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1993 return 1e99 if $self->{deny_reset};
1651 1994
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1995 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1996 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 1997
1665 my ($self) = @_; 2008 my ($self) = @_;
1666 2009
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2010 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2011
1669 return if $self->players; 2012 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2013
1672 warn "resetting map ", $self->path;#d# 2014 warn "resetting map ", $self->path;
1673 2015
1674 $self->in_memory (cf::MAP_SWAPPED); 2016 $self->in_memory (cf::MAP_SWAPPED);
1675 2017
1676 # need to save uniques path 2018 # need to save uniques path
1677 unless ($self->{deny_save}) { 2019 unless ($self->{deny_save}) {
1709 $cf::MAP{$self->path} = $self; 2051 $cf::MAP{$self->path} = $self;
1710 2052
1711 $self->reset; # polite request, might not happen 2053 $self->reset; # polite request, might not happen
1712} 2054}
1713 2055
2056=item $maps = cf::map::tmp_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059maps. May block.
2060
2061=cut
2062
2063sub tmp_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise $_
2069 : ()
2070 } @{ aio_readdir $TMPDIR or [] }
2071 ]
2072}
2073
2074=item $maps = cf::map::random_maps
2075
2076Returns an arrayref with all map paths of currently instantiated and saved
2077random maps. May block.
2078
2079=cut
2080
2081sub random_maps() {
2082 [
2083 map {
2084 utf8::decode $_;
2085 /\.map$/
2086 ? normalise "?random/$_"
2087 : ()
2088 } @{ aio_readdir $RANDOMDIR or [] }
2089 ]
2090}
2091
1714=item cf::map::unique_maps 2092=item cf::map::unique_maps
1715 2093
1716Returns an arrayref of paths of all shared maps that have 2094Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2095instantiated unique items. May block.
1718 2096
1719=cut 2097=cut
1720 2098
1721sub unique_maps() { 2099sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2100 [
1723 or return; 2101 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2102 utf8::decode $_;
1729 next if /\.pst$/; 2103 /\.map$/
1730 next unless /^$PATH_SEP/o; 2104 ? normalise $_
1731 2105 : ()
1732 push @paths, cf::map::normalise $_; 2106 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2107 ]
1734
1735 \@paths
1736} 2108}
1737 2109
1738package cf; 2110package cf;
1739 2111
1740=back 2112=back
1786 2158
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2159 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2160
1789 if ($self->{record_replies}) { 2161 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2162 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2163
1791 } else { 2164 } else {
2165 my $pl = $self->contr;
2166
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply (
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175
2176 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2177 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2178 $self->message ($msg, $flags);
2179 }
1794 } 2180 }
1795} 2181}
1796 2182
1797=item $player_object->may ("access") 2183=item $player_object->may ("access")
1798 2184
1846 $self->deactivate_recursive; 2232 $self->deactivate_recursive;
1847 2233
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2234 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2235
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2236 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2237 if $self->map && $self->map->{path} ne "{link}";
1852 2238
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2239 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2240}
1855 2241
1856sub cf::object::player::leave_link { 2242sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2243 my ($self, $map, $x, $y) = @_;
2244
2245 return unless $self->contr->active;
1858 2246
1859 my $link_pos = delete $self->{_link_pos}; 2247 my $link_pos = delete $self->{_link_pos};
1860 2248
1861 unless ($map) { 2249 unless ($map) {
1862 # restore original map position 2250 # restore original map position
1885 2273
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
1888} 2276}
1889 2277
1890cf::player->attach ( 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2279
1894 # abort map switching before logout 2280Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2281her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2282that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2283the new (success) or old (failed) map position. In either case, $done will
1898 }; 2284be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2285
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2286=cut
2287
2288our $GOTOGEN;
1925 2289
1926sub cf::object::player::goto { 2290sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2292
2293 # do generation counting so two concurrent goto's will be executed in-order
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2295
1929 $self->enter_link; 2296 $self->enter_link;
1930 2297
1931 (async { 2298 (async {
1932 my $map = eval { 2299 my $map = eval {
1933 my $map = cf::map::find $path; 2300 my $map = cf::map::find $path;
2301
2302 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2303 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map;
2305 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2307 }
2308
1935 $map 2309 $map
2310 };
2311
2312 if ($@) {
2313 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2314 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2315 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2316
2317 if ($gen == $self->{_goto_generation}) {
2318 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2320 }
2321
2322 $done->() if $done;
1940 })->prio (1); 2323 })->prio (1);
1941} 2324}
1942 2325
1943=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
1944 2327
1983 2366
1984 $rmp->{random_seed} ||= $exit->random_seed; 2367 $rmp->{random_seed} ||= $exit->random_seed;
1985 2368
1986 my $data = cf::to_json $rmp; 2369 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2370 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2371 my $meta = "$RANDOMDIR/$md5.meta";
1989 2372
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2374 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2375 undef $fh;
1993 aio_rename "$meta~", $meta; 2376 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2395 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2015 2398
2016 $self->enter_link; 2399 $self->enter_link;
2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2017 2404
2018 (async { 2405 (async {
2019 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2407 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2049 2436
2050 utf8::encode $text; 2437 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2439}
2053 2440
2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2442
2443Send a drawinfo or msg packet to the client, formatting the msg for the
2444client if neccessary. C<$type> should be a string identifying the type of
2445the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet.
2447
2448=cut
2449
2450sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_;
2452
2453 $msg = $self->pl->expand_cfpod ($msg);
2454
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case...
2458
2459 if (ref $channel) {
2460 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel);
2464 }
2465
2466 $channel = $channel->{id};
2467 }
2468
2469 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) {
2483 if (0 && $msg =~ /\[/) {
2484 $self->send_packet ("drawextinfo $color 4 0 $msg")
2485 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492
2054=item $client->ext_event ($type, %msg) 2493=item $client->ext_event ($type, %msg)
2055 2494
2056Sends an exti event to the client. 2495Sends an ext event to the client.
2057 2496
2058=cut 2497=cut
2059 2498
2060sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2062 2501
2502 return unless $self->extcmd;
2503
2063 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2065} 2506}
2066 2507
2067=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2068 2509
2069Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2511the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2512C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2513
2073Queries can fail, so check the return code. Or don't, as queries will become 2514Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2515become reliable at some point in the future.
2075 2516
2076=cut 2517=cut
2077 2518
2078sub cf::client::query { 2519sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2520 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2528 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2529 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2530
2090 $self->send_packet ($self->{query_queue}[0][0]) 2531 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2532 if @{ $self->{query_queue} } == 1;
2533
2534 1
2092} 2535}
2093 2536
2094cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2095 on_reply => sub { 2543 on_reply => sub {
2096 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2097 2545
2098 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2099 # get handled first 2547 # get handled first
2111 } else { 2559 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2560 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2561 }
2114 } 2562 }
2115 }, 2563 },
2564 on_exticmd => sub {
2565 my ($ns, $buf) = @_;
2566
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568
2569 if (ref $msg) {
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2571 if (my %reply = $cb->($ns, $msg)) {
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 }
2576 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 }
2579
2580 cf::override;
2581 },
2116); 2582);
2117 2583
2118=item $client->async (\&cb) 2584=item $client->async (\&cb)
2119 2585
2120Create a new coroutine, running the specified callback. The coroutine will 2586Create a new coroutine, running the specified callback. The coroutine will
2169 2635
2170=pod 2636=pod
2171 2637
2172The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2173 2639
2174 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2175 cf::object::player player 2644 cf::object::player
2176 cf::player peaceful 2645 player
2177 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2178 2652
2179=cut 2653=cut
2180 2654
2181for ( 2655for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2183 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2186) { 2661) {
2187 no strict 'refs'; 2662 no strict 'refs';
2258=back 2733=back
2259 2734
2260=cut 2735=cut
2261 2736
2262############################################################################# 2737#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2738# the server's init and main functions
2336 2739
2337sub load_facedata { 2740sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2741 my ($path) = @_;
2339 2742
2340 warn "loading facedata from $path\n"; 2743 warn "loading facedata from $path\n";
2341 2744
2342 my $facedata; 2745 my $facedata;
2343 0 < aio_load $path, $facedata 2746 0 < aio_load $path, $facedata
2351 { 2754 {
2352 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2353 2756
2354 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2359 Coro::cede; 2763
2764 cf::cede_to_tick;
2360 } 2765 }
2361 2766
2362 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2365 or next; 2770 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 2774 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 2776 }
2371 Coro::cede; 2777
2778 cf::cede_to_tick;
2372 } 2779 }
2373 } 2780 }
2374 2781
2375 { 2782 {
2376 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2377 2784
2378 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 2787 cf::cede_to_tick;
2381 } 2788 }
2382 2789
2383 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2384 } 2791 }
2385 2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2821 }
2822
2386 1 2823 1
2387} 2824}
2388 2825
2826sub reload_regions {
2827 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2834}
2835
2836sub reload_facedata {
2837 load_facedata "$DATADIR/facedata"
2838 or die "unable to load facedata\n";
2839}
2840
2841sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849}
2850
2851sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n";
2854}
2855
2389sub reload_resources { 2856sub reload_resources {
2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2857 warn "reloading resource files...\n";
2391 or die "unable to load regions file\n";#d# 2858
2859 reload_regions;
2392 load_facedata 2860 reload_facedata;
2393 or die "unable to load facedata\n";#d# 2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures;
2864
2865 warn "finished reloading resource files\n";
2394} 2866}
2395 2867
2396sub init { 2868sub init {
2397 reload_resources; 2869 reload_resources;
2398} 2870}
2399 2871
2400sub cfg_load { 2872sub cfg_load {
2401 open my $fh, "<:utf8", cf::confdir . "/config" 2873 open my $fh, "<:utf8", "$CONFDIR/config"
2402 or return; 2874 or return;
2403 2875
2404 local $/; 2876 local $/;
2405 *CFG = YAML::Syck::Load <$fh>; 2877 *CFG = YAML::Syck::Load <$fh>;
2406 2878
2451 }, 2923 },
2452 ); 2924 );
2453 } 2925 }
2454} 2926}
2455 2927
2928sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time.
2933
2934 IO::AIO::aio_utime $runtime, undef, undef;
2935
2936 my $guard = cf::lock_acquire "write_runtime";
2937
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2939 or return;
2940
2941 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server.
2944
2945 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2946 and return;
2947
2948 # always fsync - this file is important
2949 aio_fsync $fh
2950 and return;
2951
2952 # touch it again to show we are up-to-date
2953 aio_utime $fh, undef, undef;
2954
2955 close $fh
2956 or return;
2957
2958 aio_rename "$runtime~", $runtime
2959 and return;
2960
2961 warn "runtime file written.\n";
2962
2963 1
2964}
2965
2456sub emergency_save() { 2966sub emergency_save() {
2457 my $freeze_guard = cf::freeze_mainloop; 2967 my $freeze_guard = cf::freeze_mainloop;
2458 2968
2459 warn "enter emergency perl save\n"; 2969 warn "enter emergency perl save\n";
2460 2970
2491 3001
2492 warn Carp::longmess "post_cleanup backtrace" 3002 warn Carp::longmess "post_cleanup backtrace"
2493 if $make_core; 3003 if $make_core;
2494} 3004}
2495 3005
2496sub reload() { 3006sub do_reload_perl() {
2497 # can/must only be called in main 3007 # can/must only be called in main
2498 if ($Coro::current != $Coro::main) { 3008 if ($Coro::current != $Coro::main) {
2499 warn "can only reload from main coroutine"; 3009 warn "can only reload from main coroutine";
2500 return; 3010 return;
2501 } 3011 }
2535 %EXT_CORO = (); 3045 %EXT_CORO = ();
2536 3046
2537 warn "removing commands"; 3047 warn "removing commands";
2538 %COMMAND = (); 3048 %COMMAND = ();
2539 3049
2540 warn "removing ext commands"; 3050 warn "removing ext/exti commands";
2541 %EXTCMD = (); 3051 %EXTCMD = ();
3052 %EXTICMD = ();
2542 3053
2543 warn "unloading/nuking all extensions"; 3054 warn "unloading/nuking all extensions";
2544 for my $pkg (@EXTS) { 3055 for my $pkg (@EXTS) {
2545 warn "... unloading $pkg"; 3056 warn "... unloading $pkg";
2546 3057
2576 Symbol::delete_package "safe::$_" 3087 Symbol::delete_package "safe::$_"
2577 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3088 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2578 3089
2579 warn "unloading cf.pm \"a bit\""; 3090 warn "unloading cf.pm \"a bit\"";
2580 delete $INC{"cf.pm"}; 3091 delete $INC{"cf.pm"};
3092 delete $INC{"cf/pod.pm"};
2581 3093
2582 # don't, removes xs symbols, too, 3094 # don't, removes xs symbols, too,
2583 # and global variables created in xs 3095 # and global variables created in xs
2584 #Symbol::delete_package __PACKAGE__; 3096 #Symbol::delete_package __PACKAGE__;
2585 3097
2600 warn "reattaching attachments to maps"; 3112 warn "reattaching attachments to maps";
2601 reattach $_ for values %MAP; 3113 reattach $_ for values %MAP;
2602 warn "reattaching attachments to players"; 3114 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER; 3115 reattach $_ for values %PLAYER;
2604 3116
2605 warn "loading reloadable resources";
2606 reload_resources;
2607
2608 warn "leaving sync_job"; 3117 warn "leaving sync_job";
2609 3118
2610 1 3119 1
2611 } or do { 3120 } or do {
2612 warn $@; 3121 warn $@;
2617 warn "reloaded"; 3126 warn "reloaded";
2618}; 3127};
2619 3128
2620our $RELOAD_WATCHER; # used only during reload 3129our $RELOAD_WATCHER; # used only during reload
2621 3130
3131sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here.
3134
3135 $RELOAD_WATCHER ||= Event->timer (
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl;
3141 undef $RELOAD_WATCHER;
3142 },
3143 );
3144}
3145
2622register_command "reload" => sub { 3146register_command "reload" => sub {
2623 my ($who, $arg) = @_; 3147 my ($who, $arg) = @_;
2624 3148
2625 if ($who->flag (FLAG_WIZ)) { 3149 if ($who->flag (FLAG_WIZ)) {
2626 $who->message ("reloading server."); 3150 $who->message ("reloading server.");
2627 3151 async { reload_perl };
2628 # doing reload synchronously and two reloads happen back-to-back,
2629 # coro crashes during coro_state_free->destroy here.
2630
2631 $RELOAD_WATCHER ||= Event->timer (
2632 reentrant => 0,
2633 after => 0,
2634 data => WF_AUTOCANCEL,
2635 cb => sub {
2636 reload;
2637 undef $RELOAD_WATCHER;
2638 },
2639 );
2640 } 3152 }
2641}; 3153};
2642 3154
2643unshift @INC, $LIBDIR; 3155unshift @INC, $LIBDIR;
2644 3156
2647our @WAIT_FOR_TICK; 3159our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN; 3160our @WAIT_FOR_TICK_BEGIN;
2649 3161
2650sub wait_for_tick { 3162sub wait_for_tick {
2651 return unless $TICK_WATCHER->is_active; 3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main;
3165
2652 my $signal = new Coro::Signal; 3166 my $signal = new Coro::Signal;
2653 push @WAIT_FOR_TICK, $signal; 3167 push @WAIT_FOR_TICK, $signal;
2654 $signal->wait; 3168 $signal->wait;
2655} 3169}
2656 3170
2657sub wait_for_tick_begin { 3171sub wait_for_tick_begin {
2658 return unless $TICK_WATCHER->is_active; 3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main;
3174
2659 my $signal = new Coro::Signal; 3175 my $signal = new Coro::Signal;
2660 push @WAIT_FOR_TICK_BEGIN, $signal; 3176 push @WAIT_FOR_TICK_BEGIN, $signal;
2661 $signal->wait; 3177 $signal->wait;
2662} 3178}
2663 3179
3180 my $min = 1e6;#d#
3181 my $avg = 10;
2664$TICK_WATCHER = Event->timer ( 3182$TICK_WATCHER = Event->timer (
2665 reentrant => 0, 3183 reentrant => 0,
2666 parked => 1, 3184 parked => 1,
2667 prio => 0, 3185 prio => 0,
2668 at => $NEXT_TICK || $TICK, 3186 at => $NEXT_TICK || $TICK,
2672 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2673 unless ++$bug_warning > 10; 3191 unless ++$bug_warning > 10;
2674 return; 3192 return;
2675 } 3193 }
2676 3194
2677 $NOW = Event::time; 3195 $NOW = $tick_start = Event::time;
2678 3196
2679 cf::server_tick; # one server iteration 3197 cf::server_tick; # one server iteration
3198
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
3221
2680 $RUNTIME += $TICK; 3222 $RUNTIME += $TICK;
2681 $NEXT_TICK += $TICK; 3223 $NEXT_TICK += $TICK;
2682 3224
2683 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2684 $NEXT_RUNTIME_WRITE = $NOW + 10; 3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
2686 write_runtime 3228 write_runtime
2687 or warn "ERROR: unable to write runtime file: $!"; 3229 or warn "ERROR: unable to write runtime file: $!";
2688 }; 3230 };
2689 } 3231 }
2690 3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
2691 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2692 $sig->send; 3237 $sig->send;
2693 } 3238 }
2694 while (my $sig = shift @WAIT_FOR_TICK) { 3239 while (my $sig = shift @WAIT_FOR_TICK) {
2695 $sig->send; 3240 $sig->send;
2696 } 3241 }
2697 3242
2698# my $AFTER = Event::time; 3243 $NOW = Event::time;
2699# warn $AFTER - $NOW;#d#
2700 3244
2701 # if we are delayed by four ticks or more, skip them all 3245 # if we are delayed by four ticks or more, skip them all
2702 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2703 3247
2704 $TICK_WATCHER->at ($NEXT_TICK); 3248 $TICK_WATCHER->at ($NEXT_TICK);
2705 $TICK_WATCHER->start; 3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253
3254 _post_tick;
3255
3256
2706 }, 3257 },
2707); 3258);
2708 3259
2709{ 3260{
2710 BDB::max_poll_time $TICK * 0.1; 3261 BDB::max_poll_time $TICK * 0.1;
2738 3289
2739 cf::sync_job { 3290 cf::sync_job {
2740 eval { 3291 eval {
2741 BDB::db_env_open 3292 BDB::db_env_open
2742 $DB_ENV, 3293 $DB_ENV,
2743 $BDB_ENV_DIR, 3294 $BDBDIR,
2744 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2745 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2746 0666; 3297 0666;
2747 3298
2748 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2749 3300
2750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2751 $DB_ENV->set_lk_detect; 3302 $DB_ENV->set_lk_detect;
2752 }; 3303 };
2753 3304
2769 prio => 6, 3320 prio => 6,
2770 cb => \&IO::AIO::poll_cb, 3321 cb => \&IO::AIO::poll_cb,
2771 ); 3322 );
2772} 3323}
2773 3324
3325my $_log_backtrace;
3326
3327sub _log_backtrace {
3328 my ($msg, @addr) = @_;
3329
3330 $msg =~ s/\n//;
3331
3332 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace;
3335 async {
3336 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!";
3341
3342 my @funcs;
3343 my @res = <$fh>;
3344 chomp for @res;
3345 while (@res) {
3346 my ($func, $line) = splice @res, 0, 2, ();
3347 push @funcs, "[$func] $line";
3348 }
3349
3350 @funcs
3351 };
3352
3353 LOG llevInfo, "[ABT] $msg\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace;
3356 };
3357 } else {
3358 LOG llevInfo, "[ABT] $msg\n";
3359 LOG llevInfo, "[ABT] [suppressed]\n";
3360 }
3361}
3362
3363# load additional modules
3364use cf::pod;
3365
2774END { cf::emergency_save } 3366END { cf::emergency_save }
2775 3367
27761 33681
2777 3369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines