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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.311 by root, Fri Jul 20 16:11:10 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;
23use Coro::Storable;
21 24
25use JSON::XS 1.4 ();
22use BDB (); 26use BDB ();
23use Data::Dumper; 27use Data::Dumper;
24use Digest::MD5; 28use Digest::MD5;
25use Fcntl; 29use Fcntl;
26use YAML::Syck (); 30use YAML::Syck ();
27use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
28use Time::HiRes; 32use Time::HiRes;
29use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
30 35
31# configure various modules to our taste 36# configure various modules to our taste
32# 37#
38$Storable::canonical = 1; # reduce rsync transfers
33Coro::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
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 41
36$Event::Eval = 1; # no idea why this is required, but it is 42$Event::Eval = 1; # no idea why this is required, but it is
37 43
45our %COMMAND = (); 51our %COMMAND = ();
46our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
47 53
48our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
52 59
53our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
54our @EVENT; 61our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 62
57our $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(!)
58our $TICK_WATCHER; 76our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 79our $NEXT_TICK;
62our $NOW; 80our $NOW;
71our $RUNTIME; 89our $RUNTIME;
72 90
73our %PLAYER; # all users 91our %PLAYER; # all users
74our %MAP; # all maps 92our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 93our $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 94
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 102binmode STDOUT;
86binmode STDERR; 103binmode STDERR;
87 104
88# read virtual server time, if available 105# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
93} 110}
94 111
95mkdir cf::localdir; 112mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 113 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 114
102our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
103 116
104sub cf::map::normalise; 117sub cf::map::normalise;
105 118
116=item $cf::RUNTIME 129=item $cf::RUNTIME
117 130
118The 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
119every server tick. 132every server tick.
120 133
121=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
122 137
123The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 142
126=item $cf::NOW 143=item $cf::NOW
127 144
128The time of the last (current) server tick. 145The time of the last (current) server tick.
129 146
130=item $cf::TICK 147=item $cf::TICK
131 148
132The 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.
133 160
134=item %cf::CFG 161=item %cf::CFG
135 162
136Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 164from wherever your confdir points to.
138 165
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 166=item cf::wait_for_tick, cf::wait_for_tick_begin
140 167
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 168These 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 169returns 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 170per 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. 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.
145 177
146=back 178=back
147 179
148=cut 180=cut
149 181
150BEGIN { 182BEGIN {
151 *CORE::GLOBAL::warn = sub { 183 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 184 my $msg = join "", @_;
153 utf8::encode $msg;
154 185
155 $msg .= "\n" 186 $msg .= "\n"
156 unless $msg =~ /\n$/; 187 unless $msg =~ /\n$/;
157 188
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190
191 utf8::encode $msg;
158 LOG llevError, $msg; 192 LOG llevError, $msg;
159 }; 193 };
160} 194}
161 195
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@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';
167@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)
168 203
169# 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
170# within the Safe compartment. 205# within the Safe compartment.
171for my $pkg (qw( 206for my $pkg (qw(
172 cf::global cf::attachable 207 cf::global cf::attachable
180} 215}
181 216
182$Event::DIED = sub { 217$Event::DIED = sub {
183 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
184}; 219};
220
221#############################################################################
185 222
186=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
187 224
188=over 4 225=over 4
189 226
208 $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;
209 $d 246 $d
210 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
211} 248}
212 249
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
216 251
217Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
218 253
219=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
220 255
221Converts 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]) }
222 264
223=item cf::lock_wait $string 265=item cf::lock_wait $string
224 266
225Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
226 268
232returned. 274returned.
233 275
234Lock 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
235uses map_find and cf::map::load uses map_load). 277uses map_find and cf::map::load uses map_load).
236 278
279=item $locked = cf::lock_active $string
280
281Return true if the lock is currently active, i.e. somebody has locked it.
282
237=cut 283=cut
238 284
239our %LOCK; 285our %LOCK;
240 286
241sub lock_wait($) { 287sub lock_wait($) {
258 304
259 Coro::guard { 305 Coro::guard {
260 # wake up all waiters, to be on the safe side 306 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 307 $_->ready for @{ delete $LOCK{$key} };
262 } 308 }
309}
310
311sub lock_active($) {
312 my ($key) = @_;
313
314 ! ! $LOCK{$key}
263} 315}
264 316
265sub freeze_mainloop { 317sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 318 return unless $TICK_WATCHER->is_active;
267 319
282 334
283BEGIN { *async = \&Coro::async_pool } 335BEGIN { *async = \&Coro::async_pool }
284 336
285=item cf::sync_job { BLOCK } 337=item cf::sync_job { BLOCK }
286 338
287The design of crossfire+ requires that the main coro ($Coro::main) is 339The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 340is 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. 341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable.
290 343
291If 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
292the given BLOCK in another coroutine while waiting for the result. The 345the given BLOCK in another coroutine while waiting for the result. The
293server 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
294fast or be very important. 347fast or be very important.
297 350
298sub sync_job(&) { 351sub sync_job(&) {
299 my ($job) = @_; 352 my ($job) = @_;
300 353
301 if ($Coro::current == $Coro::main) { 354 if ($Coro::current == $Coro::main) {
355 my $time = Event::time;
356
302 # this is the main coro, too bad, we have to block 357 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 358 # till the operation succeeds, freezing the server :/
304 359
305 # TODO: use suspend/resume instead 360 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 361 # (but this is cancel-safe)
317 372
318 while ($busy) { 373 while ($busy) {
319 Coro::cede or Event::one_event; 374 Coro::cede or Event::one_event;
320 } 375 }
321 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
322 wantarray ? @res : $res[0] 384 wantarray ? @res : $res[0]
323 } else { 385 } else {
324 # we are in another coroutine, how wonderful, everything just works 386 # we are in another coroutine, how wonderful, everything just works
325 387
326 $job->() 388 $job->()
345 $EXT_CORO{$coro+0} = $coro; 407 $EXT_CORO{$coro+0} = $coro;
346 408
347 $coro 409 $coro
348} 410}
349 411
350sub write_runtime { 412=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 413
353 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.
354 418
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 419=cut
356 or return;
357 420
358 my $value = $cf::RUNTIME + 90 + 10; 421sub _store_scalar {
359 # 10 is the runtime save interval, for a monotonic clock 422 open my $fh, ">", \my $buf
360 # 60 allows for the watchdog to kill the server. 423 or die "fork_call: cannot open fh-to-buf in child : $!";
361 424 Storable::store_fd $_[0], $fh;
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0
363 and return;
364
365 # always fsync - this file is important
366 aio_fsync $fh
367 and return;
368
369 close $fh 425 close $fh;
370 or return;
371 426
372 aio_rename "$runtime~", $runtime 427 $buf
373 and return; 428}
374 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;
375 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"
376} 588}
377 589
378=item cf::datalog type => key => value, ... 590=item cf::datalog type => key => value, ...
379 591
380Log 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.
398attach callbacks/event handlers (a collection of which is called an "attachment") 610attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 611to it. All such attachable objects support the following methods.
400 612
401In 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>
402C<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
403crossfire+). 615Crossfire TRT).
404 616
405=over 4 617=over 4
406 618
407=item $attachable->attach ($attachment, key => $value...) 619=item $attachable->attach ($attachment, key => $value...)
408 620
571 $registry = $CB_TYPE[$object_type] ||= []; 783 $registry = $CB_TYPE[$object_type] ||= [];
572 784
573 } elsif ($type eq "subtype") { 785 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 786 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 787 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 788 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 789
578 } elsif ($type eq "package") { 790 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 791 my $pkg = shift @arg;
580 792
581 while (my ($name, $id) = each %cb_id) { 793 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 822 _attach $registry, $klass, @attach;
611 } 823 }
612 824
613 $obj->{$name} = \%arg; 825 $obj->{$name} = \%arg;
614 } else { 826 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 827 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 828 }
617 829
618 $obj->{_attachment}{$name} = undef; 830 $obj->{_attachment}{$name} = undef;
619} 831}
620 832
622 if (ref $_[0]) { 834 if (ref $_[0]) {
623 _object_attach @_; 835 _object_attach @_;
624 } else { 836 } else {
625 _attach shift->_attach_registry, @_; 837 _attach shift->_attach_registry, @_;
626 } 838 }
839 _recalc_want;
627}; 840};
628 841
629# all those should be optimised 842# all those should be optimised
630sub cf::attachable::detach { 843sub cf::attachable::detach {
631 my ($obj, $name) = @_; 844 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 847 delete $obj->{_attachment}{$name};
635 reattach ($obj); 848 reattach ($obj);
636 } else { 849 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 850 Carp::croak "cannot, currently, detach class attachments";
638 } 851 }
852 _recalc_want;
639}; 853};
640 854
641sub cf::attachable::attached { 855sub cf::attachable::attached {
642 my ($obj, $name) = @_; 856 my ($obj, $name) = @_;
643 857
658 "; 872 ";
659 die if $@; 873 die if $@;
660} 874}
661 875
662our $override; 876our $override;
663our @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?
664 878
665sub override { 879sub override {
666 $override = 1; 880 $override = 1;
667 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
668} 882}
669 883
670sub do_invoke { 884sub do_invoke {
671 my $event = shift; 885 my $event = shift;
672 my $callbacks = shift; 886 my $callbacks = shift;
673 887
674 @invoke_results = (); 888 @INVOKE_RESULTS = ();
675 889
676 local $override; 890 local $override;
677 891
678 for (@$callbacks) { 892 for (@$callbacks) {
679 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
696 910
697Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
698 912
699This 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
700removed 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
701results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 916
703=back 917=back
704 918
705=cut 919=cut
706 920
816 or return; 1030 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1031 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1032 }
819 1033
820 warn sprintf "loading %s (%d)\n", 1034 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1035 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1036 return ($data, $av);
823} 1037}
1038
1039=head2 COMMAND CALLBACKS
1040
1041=over 4
1042
1043=cut
824 1044
825############################################################################# 1045#############################################################################
826# command handling &c 1046# command handling &c
827 1047
828=item cf::register_command $name => \&callback($ob,$args); 1048=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1061 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1062}
843 1063
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1064=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1065
846Register a callbackf ro execution when the client sends an extcmd packet. 1066Register a callback for execution when the client sends an (synchronous)
1067extcmd packet. Ext commands will be processed in the order they are
1068received by the server, like other user commands. The first argument is
1069the logged-in player. Ext commands can only be processed after a player
1070has logged in successfully.
847 1071
848If the callback returns something, it is sent back as if reply was being 1072If the callback returns something, it is sent back as if reply was being
849called. 1073called.
850 1074
1075=item cf::register_exticmd $name => \&callback($ns,$packet);
1076
1077Register a callback for execution when the client sends an (asynchronous)
1078exticmd packet. Exti commands are processed by the server as soon as they
1079are received, i.e. out of order w.r.t. other commands. The first argument
1080is a client socket. Exti commands can be received anytime, even before
1081log-in.
1082
1083If the callback returns something, it is sent back as if reply was being
1084called.
1085
851=cut 1086=cut
852 1087
853sub register_extcmd { 1088sub register_extcmd {
854 my ($name, $cb) = @_; 1089 my ($name, $cb) = @_;
855 1090
856 $EXTCMD{$name} = $cb; 1091 $EXTCMD{$name} = $cb;
1092}
1093
1094sub register_exticmd {
1095 my ($name, $cb) = @_;
1096
1097 $EXTICMD{$name} = $cb;
857} 1098}
858 1099
859cf::player->attach ( 1100cf::player->attach (
860 on_command => sub { 1101 on_command => sub {
861 my ($pl, $name, $params) = @_; 1102 my ($pl, $name, $params) = @_;
870 cf::override; 1111 cf::override;
871 }, 1112 },
872 on_extcmd => sub { 1113 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1114 my ($pl, $buf) = @_;
874 1115
875 my $msg = eval { from_json $buf }; 1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1117
877 if (ref $msg) { 1118 if (ref $msg) {
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
879 if (my %reply = $cb->($pl, $msg)) { 1120 if (my %reply = $cb->($pl, $msg)) {
880 $pl->ext_reply ($msg->{msgid}, %reply); 1121 $pl->ext_reply ($msg->{msgid}, %reply);
886 1127
887 cf::override; 1128 cf::override;
888 }, 1129 },
889); 1130);
890 1131
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1132sub load_extensions {
1133 cf::sync_job {
1134 my %todo;
1135
926 for my $ext (<$LIBDIR/*.ext>) { 1136 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1137 next unless -r $path;
928 eval { 1138
929 load_extension $ext; 1139 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1140 my $base = $1;
1141 my $pkg = $1;
1142 $pkg =~ s/[^[:word:]]/_/g;
1143 $pkg = "ext::$pkg";
1144
1145 open my $fh, "<:utf8", $path
1146 or die "$path: $!";
1147
1148 my $source = do { local $/; <$fh> };
1149
1150 my %ext = (
1151 path => $path,
1152 base => $base,
1153 pkg => $pkg,
1154 );
1155
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158
1159 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n"
1162 . $source
1163 . "\n};\n1";
1164
1165 $todo{$base} = \%ext;
1166 }
1167
1168 my %done;
1169 while (%todo) {
1170 my $progress;
1171
1172 while (my ($k, $v) = each %todo) {
1173 for (split /,\s*/, $v->{meta}{depends}) {
1174 goto skip
1175 unless exists $done{$_};
1176 }
1177
1178 warn "... loading '$k' into '$v->{pkg}'\n";
1179
1180 unless (eval $v->{source}) {
1181 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n";
1183
1184 if (exists $v->{meta}{mandatory}) {
1185 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n";
1187 exit 1;
1188 }
1189
1190 warn $msg;
1191 }
1192
1193 $done{$k} = delete $todo{$k};
1194 push @EXTS, $v->{pkg};
1195 $progress = 1;
930 1 1196 }
931 } or warn "$ext not loaded: $@"; 1197
1198 skip:
1199 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1200 unless $progress;
1201 }
932 } 1202 };
933} 1203}
934 1204
935############################################################################# 1205#############################################################################
936 1206
1207=back
1208
937=head2 CORE EXTENSIONS 1209=head2 CORE EXTENSIONS
938 1210
939Functions and methods that extend core crossfire objects. 1211Functions and methods that extend core crossfire objects.
940 1212
941=cut 1213=cut
953Returns the given player object, loading it if necessary (might block). 1225Returns the given player object, loading it if necessary (might block).
954 1226
955=cut 1227=cut
956 1228
957sub playerdir($) { 1229sub playerdir($) {
958 cf::localdir 1230 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1231 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1232}
964 1233
965sub path($) { 1234sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1235 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1236
968 (playerdir $login) . "/$login.pl" 1237 (playerdir $login) . "/playerdata"
969} 1238}
970 1239
971sub find_active($) { 1240sub find_active($) {
972 $cf::PLAYER{$_[0]} 1241 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1242 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1255 my $login = $_[0];
987 1256
988 my $guard = cf::lock_acquire "user_find:$login"; 1257 my $guard = cf::lock_acquire "user_find:$login";
989 1258
990 $cf::PLAYER{$_[0]} || do { 1259 $cf::PLAYER{$_[0]} || do {
1260 # rename old playerfiles to new ones
1261 #TODO: remove when no longer required
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl";
1266
991 my $pl = load_pl path $login 1267 my $pl = load_pl path $login
992 or return; 1268 or return;
993 $cf::PLAYER{$login} = $pl 1269 $cf::PLAYER{$login} = $pl
994 } 1270 }
995 } 1271 }
1079while and may block, so not sync_job-capable, ever. 1355while and may block, so not sync_job-capable, ever.
1080 1356
1081=cut 1357=cut
1082 1358
1083sub list_logins { 1359sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1360 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1361 or return [];
1086 1362
1087 my @logins; 1363 my @logins;
1088 1364
1089 for my $login (@$dirs) { 1365 for my $login (@$dirs) {
1124 } 1400 }
1125 1401
1126 \@paths 1402 \@paths
1127} 1403}
1128 1404
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1406
1407Expand crossfire pod fragments into protocol xml.
1408
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1129=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
1130 1456
1131Sends an ext reply to the player. 1457Sends an ext reply to the player.
1132 1458
1133=cut 1459=cut
1134 1460
1135sub ext_reply($$%) { 1461sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1462 my ($self, $id, %msg) = @_;
1137 1463
1138 $msg{msgid} = $id; 1464 $msg{msgid} = $id;
1139 1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1466}
1142 1467
1143=item $player->ext_event ($type, %msg) 1468=item $player->ext_event ($type, %msg)
1144 1469
1145Sends an ext event to the client. 1470Sends an ext event to the client.
1150 my ($self, $type, %msg) = @_; 1475 my ($self, $type, %msg) = @_;
1151 1476
1152 $self->ns->ext_event ($type, %msg); 1477 $self->ns->ext_event ($type, %msg);
1153} 1478}
1154 1479
1155package cf; 1480=head3 cf::region
1481
1482=over 4
1483
1484=cut
1485
1486package cf::region;
1487
1488=item cf::region::find_by_path $path
1489
1490Tries to decuce the likely region for a map knowing only its path.
1491
1492=cut
1493
1494sub find_by_path($) {
1495 my ($path) = @_;
1496
1497 my ($match, $specificity);
1498
1499 for my $region (list) {
1500 if ($region->{match} && $path =~ $region->{match}) {
1501 ($match, $specificity) = ($region, $region->specificity)
1502 if $region->specificity > $specificity;
1503 }
1504 }
1505
1506 $match
1507}
1156 1508
1157=back 1509=back
1158
1159 1510
1160=head3 cf::map 1511=head3 cf::map
1161 1512
1162=over 4 1513=over 4
1163 1514
1218 my ($self, $merge) = @_; 1569 my ($self, $merge) = @_;
1219 1570
1220 # we have to keep some variables in memory intact 1571 # we have to keep some variables in memory intact
1221 local $self->{path}; 1572 local $self->{path};
1222 local $self->{load_path}; 1573 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1574
1226 $self->SUPER::thawer_merge ($merge); 1575 $self->SUPER::thawer_merge ($merge);
1227} 1576}
1228 1577
1229sub normalise { 1578sub normalise {
1276 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1277 return $self; 1626 return $self;
1278 } 1627 }
1279 } 1628 }
1280 1629
1281 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1282 () 1631 ()
1283} 1632}
1284 1633
1285sub init { 1634sub init {
1286 my ($self) = @_; 1635 my ($self) = @_;
1301 1650
1302# the original (read-only) location 1651# the original (read-only) location
1303sub load_path { 1652sub load_path {
1304 my ($self) = @_; 1653 my ($self) = @_;
1305 1654
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1655 "$MAPDIR/$self->{path}.map"
1307} 1656}
1308 1657
1309# the temporary/swap location 1658# the temporary/swap location
1310sub save_path { 1659sub save_path {
1311 my ($self) = @_; 1660 my ($self) = @_;
1312 1661
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1663 "$TMPDIR/$path.map"
1315} 1664}
1316 1665
1317# the unique path, undef == no special unique path 1666# the unique path, undef == no special unique path
1318sub uniq_path { 1667sub uniq_path {
1319 my ($self) = @_; 1668 my ($self) = @_;
1320 1669
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1671 "$UNIQUEDIR/$path"
1323} 1672}
1324 1673
1325# and all this just because we cannot iterate over 1674# and all this just because we cannot iterate over
1326# all maps in C++... 1675# all maps in C++...
1327sub change_all_map_light { 1676sub change_all_map_light {
1328 my ($change) = @_; 1677 my ($change) = @_;
1329 1678
1330 $_->change_map_light ($change) 1679 $_->change_map_light ($change)
1331 for grep $_->outdoor, values %cf::MAP; 1680 for grep $_->outdoor, values %cf::MAP;
1681}
1682
1683sub decay_objects {
1684 my ($self) = @_;
1685
1686 return if $self->{deny_reset};
1687
1688 $self->do_decay_objects;
1332} 1689}
1333 1690
1334sub unlink_save { 1691sub unlink_save {
1335 my ($self) = @_; 1692 my ($self) = @_;
1336 1693
1394 $self->load_header_orig 1751 $self->load_header_orig
1395 or return; 1752 or return;
1396 $self->prepare_orig; 1753 $self->prepare_orig;
1397 } 1754 }
1398 1755
1756 $self->{deny_reset} = 1
1757 if $self->no_reset;
1758
1759 $self->default_region (cf::region::find_by_path $self->{path})
1760 unless $self->default_region;
1761
1399 1 1762 1
1400} 1763}
1401 1764
1402sub find; 1765sub find;
1403sub find { 1766sub find {
1415 $map->{last_save} = $cf::RUNTIME; 1778 $map->{last_save} = $cf::RUNTIME;
1416 1779
1417 $map->load_header 1780 $map->load_header
1418 or return; 1781 or return;
1419 1782
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1784 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1785 #$cf::WAIT_FOR_TICK->wait;
1423 $map->reset; 1786 $map->reset;
1424 undef $guard; 1787 undef $guard;
1425 return find $path; 1788 return find $path;
1436 my ($self) = @_; 1799 my ($self) = @_;
1437 1800
1438 local $self->{deny_reset} = 1; # loading can take a long time 1801 local $self->{deny_reset} = 1; # loading can take a long time
1439 1802
1440 my $path = $self->{path}; 1803 my $path = $self->{path};
1804
1805 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1806 my $guard = cf::lock_acquire "map_load:$path";
1442 1807
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1808 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1809
1445 $self->in_memory (cf::MAP_LOADING); 1810 $self->in_memory (cf::MAP_LOADING);
1446 1811
1447 $self->alloc; 1812 $self->alloc;
1448 1813
1449 $self->pre_load; 1814 $self->pre_load;
1450
1451 $self->_load_objects ($self->{load_path}, 1)
1452 or return;
1453
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original};
1456
1457 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0);
1462 }
1463 }
1464
1465 Coro::cede;
1466
1467 # now do the right thing for maps
1468 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede; 1815 Coro::cede;
1475 $self->set_darkness_map; 1816
1817 $self->_load_objects ($self->{load_path}, 1)
1818 or return;
1819
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original};
1822
1823 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) {
1826 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0);
1828 }
1829 }
1830
1831 Coro::cede;
1832 # now do the right thing for maps
1833 $self->link_multipart_objects;
1476 $self->difficulty ($self->estimate_difficulty) 1834 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1835 unless $self->difficulty;
1478 Coro::cede; 1836 Coro::cede;
1837
1838 unless ($self->{deny_activate}) {
1839 $self->decay_objects;
1840 $self->fix_auto_apply;
1841 $self->update_buttons;
1842 Coro::cede;
1843 $self->set_darkness_map;
1844 Coro::cede;
1479 $self->activate; 1845 $self->activate;
1846 }
1847
1848 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1849 }
1481 1850
1482 $self->post_load; 1851 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1852}
1486 1853
1487sub customise_for { 1854sub customise_for {
1488 my ($self, $ob) = @_; 1855 my ($self, $ob) = @_;
1489 1856
1490 return find "~" . $ob->name . "/" . $self->{path} 1857 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1858 if $self->per_player;
1859
1860# return find "?party/" . $ob->name . "/" . $self->{path}
1861# if $self->per_party;
1492 1862
1493 $self 1863 $self
1494} 1864}
1495 1865
1496# find and load all maps in the 3x3 area around a map 1866# find and load all maps in the 3x3 area around a map
1543 1913
1544 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1545 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1546 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1547 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1548 my $map = find $path 1918 if (my $map = find $path) {
1549 or next;
1550 $map->load; 1919 $map->load;
1920 }
1551 1921
1552 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1553 } 1923 }
1554 } 1924 }
1555 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
1607 1977
1608sub reset_at { 1978sub reset_at {
1609 my ($self) = @_; 1979 my ($self) = @_;
1610 1980
1611 # TODO: safety, remove and allow resettable per-player maps 1981 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 1982 return 1e99 if $self->{deny_reset};
1614 1983
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1984 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1985 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1617 1986
1628 my ($self) = @_; 1997 my ($self) = @_;
1629 1998
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1999 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 2000
1632 return if $self->players; 2001 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 2002
1635 warn "resetting map ", $self->path;#d# 2003 warn "resetting map ", $self->path;
1636 2004
1637 $self->in_memory (cf::MAP_SWAPPED); 2005 $self->in_memory (cf::MAP_SWAPPED);
1638 2006
1639 # need to save uniques path 2007 # need to save uniques path
1640 unless ($self->{deny_save}) { 2008 unless ($self->{deny_save}) {
1672 $cf::MAP{$self->path} = $self; 2040 $cf::MAP{$self->path} = $self;
1673 2041
1674 $self->reset; # polite request, might not happen 2042 $self->reset; # polite request, might not happen
1675} 2043}
1676 2044
2045=item $maps = cf::map::tmp_maps
2046
2047Returns an arrayref with all map paths of currently instantiated and saved
2048maps. May block.
2049
2050=cut
2051
2052sub tmp_maps() {
2053 [
2054 map {
2055 utf8::decode $_;
2056 /\.map$/
2057 ? normalise $_
2058 : ()
2059 } @{ aio_readdir $TMPDIR or [] }
2060 ]
2061}
2062
2063=item $maps = cf::map::random_maps
2064
2065Returns an arrayref with all map paths of currently instantiated and saved
2066random maps. May block.
2067
2068=cut
2069
2070sub random_maps() {
2071 [
2072 map {
2073 utf8::decode $_;
2074 /\.map$/
2075 ? normalise "?random/$_"
2076 : ()
2077 } @{ aio_readdir $RANDOMDIR or [] }
2078 ]
2079}
2080
1677=item cf::map::unique_maps 2081=item cf::map::unique_maps
1678 2082
1679Returns an arrayref of paths of all shared maps that have 2083Returns an arrayref of paths of all shared maps that have
1680instantiated unique items. May block. 2084instantiated unique items. May block.
1681 2085
1682=cut 2086=cut
1683 2087
1684sub unique_maps() { 2088sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2089 [
1686 or return; 2090 map {
1687
1688 my @paths;
1689
1690 for (@$files) {
1691 utf8::decode $_; 2091 utf8::decode $_;
1692 next if /\.pst$/; 2092 /\.map$/
1693 next unless /^$PATH_SEP/o; 2093 ? normalise $_
1694 2094 : ()
1695 push @paths, cf::map::normalise $_; 2095 } @{ aio_readdir $UNIQUEDIR or [] }
1696 } 2096 ]
1697
1698 \@paths
1699} 2097}
1700 2098
1701package cf; 2099package cf;
1702 2100
1703=back 2101=back
1749 2147
1750 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2148 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1751 2149
1752 if ($self->{record_replies}) { 2150 if ($self->{record_replies}) {
1753 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2151 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2152
1754 } else { 2153 } else {
2154 my $pl = $self->contr;
2155
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply (
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164
2165 } else {
1755 $msg = $npc->name . " says: $msg" if $npc; 2166 $msg = $npc->name . " says: $msg" if $npc;
1756 $self->message ($msg, $flags); 2167 $self->message ($msg, $flags);
2168 }
1757 } 2169 }
1758} 2170}
1759 2171
1760=item $player_object->may ("access") 2172=item $player_object->may ("access")
1761 2173
1809 $self->deactivate_recursive; 2221 $self->deactivate_recursive;
1810 2222
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2223 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 2224
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2225 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 2226 if $self->map && $self->map->{path} ne "{link}";
1815 2227
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2228 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 2229}
1818 2230
1819sub cf::object::player::leave_link { 2231sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 2232 my ($self, $map, $x, $y) = @_;
2233
2234 return unless $self->contr->active;
1821 2235
1822 my $link_pos = delete $self->{_link_pos}; 2236 my $link_pos = delete $self->{_link_pos};
1823 2237
1824 unless ($map) { 2238 unless ($map) {
1825 # restore original map position 2239 # restore original map position
1848 2262
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
1851} 2265}
1852 2266
1853cf::player->attach ( 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1854 on_logout => sub {
1855 my ($pl) = @_;
1856 2268
1857 # abort map switching before logout 2269Moves the player to the given map-path and coordinates by first freezing
1858 if ($pl->ob->{_link_pos}) { 2270her, loading and preparing them map, calling the provided $check callback
1859 cf::sync_job { 2271that has to return the map if sucecssful, and then unfreezes the player on
1860 $pl->ob->leave_link 2272the new (success) or old (failed) map position. In either case, $done will
1861 }; 2273be called at the end of this process.
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866 2274
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y)
1886
1887=cut 2275=cut
2276
2277our $GOTOGEN;
1888 2278
1889sub cf::object::player::goto { 2279sub cf::object::player::goto {
1890 my ($self, $path, $x, $y) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2281
2282 # do generation counting so two concurrent goto's will be executed in-order
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1891 2284
1892 $self->enter_link; 2285 $self->enter_link;
1893 2286
1894 (async { 2287 (async {
1895 my $map = eval { 2288 my $map = eval {
1896 my $map = cf::map::find $path; 2289 my $map = cf::map::find $path;
2290
2291 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 2292 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map;
2294 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2296 }
2297
1898 $map 2298 $map
2299 };
2300
2301 if ($@) {
2302 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2303 LOG llevError | logBacktrace, Carp::longmess $@;
1899 } or 2304 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 2305
2306 if ($gen == $self->{_goto_generation}) {
2307 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2309 }
2310
2311 $done->() if $done;
1903 })->prio (1); 2312 })->prio (1);
1904} 2313}
1905 2314
1906=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
1907 2316
1946 2355
1947 $rmp->{random_seed} ||= $exit->random_seed; 2356 $rmp->{random_seed} ||= $exit->random_seed;
1948 2357
1949 my $data = cf::to_json $rmp; 2358 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2359 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2360 my $meta = "$RANDOMDIR/$md5.meta";
1952 2361
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2363 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2364 undef $fh;
1956 aio_rename "$meta~", $meta; 2365 aio_rename "$meta~", $meta;
1965 2374
1966 return unless $self->type == cf::PLAYER; 2375 return unless $self->type == cf::PLAYER;
1967 2376
1968 if ($exit->slaying eq "/!") { 2377 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2381 cf::sync_job { prepare_random_map $exit };
1971 } 2382 }
1972 2383
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
1975 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
1976 2387
1977 $self->enter_link; 2388 $self->enter_link;
2389
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
1978 2393
1979 (async { 2394 (async {
1980 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
1981 unless (eval { 2396 unless (eval {
1982 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
1983 2398
1984 1; 2399 1;
1985 }) { 2400 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2401 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2402 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2403 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2404 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2405
1991 warn "ERROR in enter_exit: $@"; 2406 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2407 $self->leave_link;
1993 } 2408 }
1994 })->prio (1); 2409 })->prio (1);
2010 2425
2011 utf8::encode $text; 2426 utf8::encode $text;
2012 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2013} 2428}
2014 2429
2430=item $client->send_msg ($channel, $msg, $color, [extra...])
2431
2432Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet.
2436
2437=cut
2438
2439sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_;
2441
2442 $msg = $self->pl->expand_cfpod ($msg);
2443
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case...
2447
2448 if (ref $channel) {
2449 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel);
2453 }
2454
2455 $channel = $channel->{id};
2456 }
2457
2458 if ($self->can_msg) {
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2460 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) {
2472 if (0 && $msg =~ /\[/) {
2473 $self->send_packet ("drawextinfo $color 4 0 $msg")
2474 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg")
2477 }
2478 }
2479 }
2480}
2481
2015=item $client->ext_event ($type, %msg) 2482=item $client->ext_event ($type, %msg)
2016 2483
2017Sends an exti event to the client. 2484Sends an ext event to the client.
2018 2485
2019=cut 2486=cut
2020 2487
2021sub cf::client::ext_event($$%) { 2488sub cf::client::ext_event($$%) {
2022 my ($self, $type, %msg) = @_; 2489 my ($self, $type, %msg) = @_;
2023 2490
2491 return unless $self->extcmd;
2492
2024 $msg{msgtype} = "event_$type"; 2493 $msg{msgtype} = "event_$type";
2025 $self->send_packet ("ext " . cf::to_json \%msg); 2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2026} 2495}
2027 2496
2028=item $success = $client->query ($flags, "text", \&cb) 2497=item $success = $client->query ($flags, "text", \&cb)
2029 2498
2030Queues a query to the client, calling the given callback with 2499Queues a query to the client, calling the given callback with
2031the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2500the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2032C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2501C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2033 2502
2034Queries can fail, so check the return code. Or don't, as queries will become 2503Queries can fail, so check the return code. Or don't, as queries will
2035reliable at some point in the future. 2504become reliable at some point in the future.
2036 2505
2037=cut 2506=cut
2038 2507
2039sub cf::client::query { 2508sub cf::client::query {
2040 my ($self, $flags, $text, $cb) = @_; 2509 my ($self, $flags, $text, $cb) = @_;
2048 utf8::encode $text; 2517 utf8::encode $text;
2049 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2518 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2050 2519
2051 $self->send_packet ($self->{query_queue}[0][0]) 2520 $self->send_packet ($self->{query_queue}[0][0])
2052 if @{ $self->{query_queue} } == 1; 2521 if @{ $self->{query_queue} } == 1;
2522
2523 1
2053} 2524}
2054 2525
2055cf::client->attach ( 2526cf::client->attach (
2527 on_connect => sub {
2528 my ($ns) = @_;
2529
2530 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2531 },
2056 on_reply => sub { 2532 on_reply => sub {
2057 my ($ns, $msg) = @_; 2533 my ($ns, $msg) = @_;
2058 2534
2059 # this weird shuffling is so that direct followup queries 2535 # this weird shuffling is so that direct followup queries
2060 # get handled first 2536 # get handled first
2072 } else { 2548 } else {
2073 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2549 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2074 } 2550 }
2075 } 2551 }
2076 }, 2552 },
2553 on_exticmd => sub {
2554 my ($ns, $buf) = @_;
2555
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557
2558 if (ref $msg) {
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2560 if (my %reply = $cb->($ns, $msg)) {
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 }
2565 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 }
2568
2569 cf::override;
2570 },
2077); 2571);
2078 2572
2079=item $client->async (\&cb) 2573=item $client->async (\&cb)
2080 2574
2081Create a new coroutine, running the specified callback. The coroutine will 2575Create a new coroutine, running the specified callback. The coroutine will
2130 2624
2131=pod 2625=pod
2132 2626
2133The following functions and methods are available within a safe environment: 2627The following functions and methods are available within a safe environment:
2134 2628
2135 cf::object contr pay_amount pay_player map 2629 cf::object
2630 contr pay_amount pay_player map x y force_find force_add
2631 insert remove
2632
2136 cf::object::player player 2633 cf::object::player
2137 cf::player peaceful 2634 player
2138 cf::map trigger 2635
2636 cf::player
2637 peaceful
2638
2639 cf::map
2640 trigger
2139 2641
2140=cut 2642=cut
2141 2643
2142for ( 2644for (
2143 ["cf::object" => qw(contr pay_amount pay_player map)], 2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)],
2144 ["cf::object::player" => qw(player)], 2647 ["cf::object::player" => qw(player)],
2145 ["cf::player" => qw(peaceful)], 2648 ["cf::player" => qw(peaceful)],
2146 ["cf::map" => qw(trigger)], 2649 ["cf::map" => qw(trigger)],
2147) { 2650) {
2148 no strict 'refs'; 2651 no strict 'refs';
2219=back 2722=back
2220 2723
2221=cut 2724=cut
2222 2725
2223############################################################################# 2726#############################################################################
2224
2225=head2 EXTENSION DATABASE SUPPORT
2226
2227Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which
2229excludes objects.
2230
2231The parameter C<$family> should best start with the name of the extension
2232using it, it should be unique.
2233
2234=over 4
2235
2236=item $value = cf::db_get $family => $key
2237
2238Returns a single value from the database.
2239
2240=item cf::db_put $family => $key => $value
2241
2242Stores the given C<$value> in the family.
2243
2244=cut
2245
2246our $DB;
2247
2248sub db_init {
2249 unless ($DB) {
2250 $DB = BDB::db_create $DB_ENV;
2251
2252 cf::sync_job {
2253 eval {
2254 $DB->set_flags (BDB::CHKSUM);
2255
2256 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!;
2259 };
2260 cf::cleanup "db_open(db): $@" if $@;
2261 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 }
2277}
2278
2279sub db_get($$) {
2280 my $key = "$_[0]/$_[1]";
2281
2282 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data;
2284
2285 $! ? ()
2286 : Compress::LZF::sthaw $data
2287 }
2288}
2289
2290sub db_put($$$) {
2291 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2293}
2294
2295#############################################################################
2296# the server's init and main functions 2727# the server's init and main functions
2297 2728
2298sub load_facedata { 2729sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2730 my ($path) = @_;
2300 2731
2301 warn "loading facedata from $path\n"; 2732 warn "loading facedata from $path\n";
2302 2733
2303 my $faces; 2734 my $facedata;
2304 0 < aio_load $path, $faces 2735 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2736 or die "$path: $!";
2306 2737
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2738 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2739
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2740 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2741 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2742
2743 {
2744 my $faces = $facedata->{faceinfo};
2745
2315 while (my ($face, $info) = each %$faces) { 2746 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2747 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2748 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede;
2321 }
2322 2752
2753 cf::cede_to_tick;
2754 }
2755
2323 while (my ($face, $info) = each %$faces) { 2756 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2757 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2758 my $idx = cf::face::find $face
2326 or next; 2759 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2760 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2761 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2329 } else { 2763 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2764 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2765 }
2332 Coro::cede; 2766
2767 cf::cede_to_tick;
2768 }
2769 }
2770
2771 {
2772 my $anims = $facedata->{animinfo};
2773
2774 while (my ($anim, $info) = each %$anims) {
2775 cf::anim::set $anim, $info->{frames}, $info->{facings};
2776 cf::cede_to_tick;
2777 }
2778
2779 cf::anim::invalidate_all; # d'oh
2780 }
2781
2782 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787
2788 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2800 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 }
2807
2808 cf::cede_to_tick;
2809 }
2333 } 2810 }
2334 2811
2335 1 2812 1
2336} 2813}
2337 2814
2815sub reload_regions {
2816 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n";
2818
2819 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/
2821 if exists $_->{match};
2822 }
2823}
2824
2825sub reload_facedata {
2826 load_facedata "$DATADIR/facedata"
2827 or die "unable to load facedata\n";
2828}
2829
2830sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838}
2839
2840sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n";
2843}
2844
2338sub reload_resources { 2845sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2846 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 2847
2848 reload_regions;
2341 load_facedata 2849 reload_facedata;
2342 or die "unable to load facedata\n";#d# 2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures;
2853
2854 warn "finished reloading resource files\n";
2343} 2855}
2344 2856
2345sub init { 2857sub init {
2346 reload_resources; 2858 reload_resources;
2347} 2859}
2348 2860
2349sub cfg_load { 2861sub cfg_load {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 2862 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 2863 or return;
2352 2864
2353 local $/; 2865 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 2866 *CFG = YAML::Syck::Load <$fh>;
2355 2867
2400 }, 2912 },
2401 ); 2913 );
2402 } 2914 }
2403} 2915}
2404 2916
2917sub write_runtime {
2918 my $runtime = "$LOCALDIR/runtime";
2919
2920 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time.
2922
2923 IO::AIO::aio_utime $runtime, undef, undef;
2924
2925 my $guard = cf::lock_acquire "write_runtime";
2926
2927 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2928 or return;
2929
2930 my $value = $cf::RUNTIME + 90 + 10;
2931 # 10 is the runtime save interval, for a monotonic clock
2932 # 60 allows for the watchdog to kill the server.
2933
2934 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2935 and return;
2936
2937 # always fsync - this file is important
2938 aio_fsync $fh
2939 and return;
2940
2941 # touch it again to show we are up-to-date
2942 aio_utime $fh, undef, undef;
2943
2944 close $fh
2945 or return;
2946
2947 aio_rename "$runtime~", $runtime
2948 and return;
2949
2950 warn "runtime file written.\n";
2951
2952 1
2953}
2954
2405sub emergency_save() { 2955sub emergency_save() {
2406 my $freeze_guard = cf::freeze_mainloop; 2956 my $freeze_guard = cf::freeze_mainloop;
2407 2957
2408 warn "enter emergency perl save\n"; 2958 warn "enter emergency perl save\n";
2409 2959
2440 2990
2441 warn Carp::longmess "post_cleanup backtrace" 2991 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 2992 if $make_core;
2443} 2993}
2444 2994
2445sub reload() { 2995sub do_reload_perl() {
2446 # can/must only be called in main 2996 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 2997 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 2998 warn "can only reload from main coroutine";
2449 return; 2999 return;
2450 } 3000 }
2484 %EXT_CORO = (); 3034 %EXT_CORO = ();
2485 3035
2486 warn "removing commands"; 3036 warn "removing commands";
2487 %COMMAND = (); 3037 %COMMAND = ();
2488 3038
2489 warn "removing ext commands"; 3039 warn "removing ext/exti commands";
2490 %EXTCMD = (); 3040 %EXTCMD = ();
3041 %EXTICMD = ();
2491 3042
2492 warn "unloading/nuking all extensions"; 3043 warn "unloading/nuking all extensions";
2493 for my $pkg (@EXTS) { 3044 for my $pkg (@EXTS) {
2494 warn "... unloading $pkg"; 3045 warn "... unloading $pkg";
2495 3046
2525 Symbol::delete_package "safe::$_" 3076 Symbol::delete_package "safe::$_"
2526 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3077 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2527 3078
2528 warn "unloading cf.pm \"a bit\""; 3079 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 3080 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"};
2530 3082
2531 # don't, removes xs symbols, too, 3083 # don't, removes xs symbols, too,
2532 # and global variables created in xs 3084 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 3085 #Symbol::delete_package __PACKAGE__;
2534 3086
2549 warn "reattaching attachments to maps"; 3101 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 3102 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 3103 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 3104 reattach $_ for values %PLAYER;
2553 3105
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 3106 warn "leaving sync_job";
2558 3107
2559 1 3108 1
2560 } or do { 3109 } or do {
2561 warn $@; 3110 warn $@;
2566 warn "reloaded"; 3115 warn "reloaded";
2567}; 3116};
2568 3117
2569our $RELOAD_WATCHER; # used only during reload 3118our $RELOAD_WATCHER; # used only during reload
2570 3119
3120sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here.
3123
3124 $RELOAD_WATCHER ||= Event->timer (
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl;
3130 undef $RELOAD_WATCHER;
3131 },
3132 );
3133}
3134
2571register_command "reload" => sub { 3135register_command "reload" => sub {
2572 my ($who, $arg) = @_; 3136 my ($who, $arg) = @_;
2573 3137
2574 if ($who->flag (FLAG_WIZ)) { 3138 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 3139 $who->message ("reloading server.");
2576 3140 async { reload_perl };
2577 # doing reload synchronously and two reloads happen back-to-back,
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload;
2586 undef $RELOAD_WATCHER;
2587 },
2588 );
2589 } 3141 }
2590}; 3142};
2591 3143
2592unshift @INC, $LIBDIR; 3144unshift @INC, $LIBDIR;
2593 3145
2594my $bug_warning = 0; 3146my $bug_warning = 0;
2595 3147
3148our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN;
3150
3151sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main;
3154
3155 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait;
3158}
3159
3160sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main;
3163
3164 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait;
3167}
3168
3169 my $min = 1e6;#d#
3170 my $avg = 10;
2596$TICK_WATCHER = Event->timer ( 3171$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 3172 reentrant => 0,
2598 parked => 1, 3173 parked => 1,
2599 prio => 0, 3174 prio => 0,
2600 at => $NEXT_TICK || $TICK, 3175 at => $NEXT_TICK || $TICK,
2604 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2605 unless ++$bug_warning > 10; 3180 unless ++$bug_warning > 10;
2606 return; 3181 return;
2607 } 3182 }
2608 3183
2609 $NOW = Event::time; 3184 $NOW = $tick_start = Event::time;
2610 3185
2611 cf::server_tick; # one server iteration 3186 cf::server_tick; # one server iteration
3187
3188 0 && sync_job {#d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 };
3210
2612 $RUNTIME += $TICK; 3211 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 3212 $NEXT_TICK += $TICK;
2614 3213
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
2618 write_runtime 3217 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 3218 or warn "ERROR: unable to write runtime file: $!";
2620 }; 3219 };
2621 } 3220 }
2622 3221
2623 $WAIT_FOR_TICK->broadcast;
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2625
2626# my $AFTER = Event::time; 3222# my $AFTER = Event::time;
2627# warn $AFTER - $NOW;#d# 3223# warn $AFTER - $NOW;#d#
2628 3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send;
3227 }
3228 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send;
3230 }
3231
3232 $NOW = Event::time;
3233
2629 # if we are delayed by four ticks or more, skip them all 3234 # if we are delayed by four ticks or more, skip them all
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 3236
2632 $TICK_WATCHER->at ($NEXT_TICK); 3237 $TICK_WATCHER->at ($NEXT_TICK);
2633 $TICK_WATCHER->start; 3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242
3243 _post_tick;
3244
3245
2634 }, 3246 },
2635); 3247);
2636 3248
2637{ 3249{
2638 BDB::max_poll_time $TICK * 0.1; 3250 BDB::max_poll_time $TICK * 0.1;
2666 3278
2667 cf::sync_job { 3279 cf::sync_job {
2668 eval { 3280 eval {
2669 BDB::db_env_open 3281 BDB::db_env_open
2670 $DB_ENV, 3282 $DB_ENV,
2671 $BDB_ENV_DIR, 3283 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 3286 0666;
2675 3287
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677 3289
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect; 3291 $DB_ENV->set_lk_detect;
2680 }; 3292 };
2681 3293
2697 prio => 6, 3309 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 3310 cb => \&IO::AIO::poll_cb,
2699 ); 3311 );
2700} 3312}
2701 3313
3314my $_log_backtrace;
3315
3316sub _log_backtrace {
3317 my ($msg, @addr) = @_;
3318
3319 $msg =~ s/\n//;
3320
3321 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace;
3324 async {
3325 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!";
3330
3331 my @funcs;
3332 my @res = <$fh>;
3333 chomp for @res;
3334 while (@res) {
3335 my ($func, $line) = splice @res, 0, 2, ();
3336 push @funcs, "[$func] $line";
3337 }
3338
3339 @funcs
3340 };
3341
3342 LOG llevInfo, "[ABT] $msg\n";
3343 LOG llevInfo, "[ABT] $_\n" for @bt;
3344 --$_log_backtrace;
3345 };
3346 } else {
3347 LOG llevInfo, "[ABT] $msg\n";
3348 LOG llevInfo, "[ABT] [suppressed]\n";
3349 }
3350}
3351
3352# load additional modules
3353use cf::pod;
3354
2702END { cf::emergency_save } 3355END { cf::emergency_save }
2703 3356
27041 33571
2705 3358

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines