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.224 by root, Mon Mar 12 21:42:12 2007 UTC vs.
Revision 1.289 by root, Sat Jun 30 03:00:54 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;
30use YAML::Syck ();
26use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
27use YAML::Syck ();
28use Time::HiRes; 32use Time::HiRes;
29use Compress::LZF; 33use Compress::LZF;
30 34
35# configure various modules to our taste
36#
37$Storable::canonical = 1; # reduce rsync transfers
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
33$Event::Eval = 1; # no idea why this is required, but it is 41$Event::Eval = 1; # no idea why this is required, but it is
34
35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 42
37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
39 45
40$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
41 47
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49
42our %COMMAND = (); 50our %COMMAND = ();
43our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
44 52
45our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
46our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
47our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
48our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
49 58
50our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
51our @EVENT; 60our @EVENT;
52our $LIBDIR = datadir . "/ext";
53 61
54our $TICK = MAX_TIME * 1e-6; 62our $CONFDIR = confdir;
63our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db";
73
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
55our $TICK_WATCHER; 75our $TICK_WATCHER;
56our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58our $NEXT_TICK; 78our $NEXT_TICK;
59our $NOW; 79our $NOW;
68our $RUNTIME; 88our $RUNTIME;
69 89
70our %PLAYER; # all users 90our %PLAYER; # all users
71our %MAP; # all maps 91our %MAP; # all maps
72our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
75
76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
78 93
79# used to convert map paths into valid unix filenames by replacing / by ∕ 94# used to convert map paths into valid unix filenames by replacing / by ∕
80our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81 96
97our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing
99our $tick_start; # for load detecting purposes
100
82binmode STDOUT; 101binmode STDOUT;
83binmode STDERR; 102binmode STDERR;
84 103
85# read virtual server time, if available 104# read virtual server time, if available
86unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
87 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
88 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
89 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
90} 109}
91 110
92mkdir cf::localdir; 111mkdir $_
93mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
94mkdir cf::localdir . "/" . cf::tmpdir;
95mkdir cf::localdir . "/" . cf::uniquedir;
96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
98 113
99our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
100 115
101sub cf::map::normalise; 116sub cf::map::normalise;
102 117
113=item $cf::RUNTIME 128=item $cf::RUNTIME
114 129
115The time this server has run, starts at 0 and is increased by $cf::TICK on 130The time this server has run, starts at 0 and is increased by $cf::TICK on
116every server tick. 131every server tick.
117 132
118=item $cf::LIBDIR 133=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
134$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
135$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
119 136
120The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
121be found. It will be added to C<@INC> automatically. 138directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and
140database environment.
122 141
123=item $cf::NOW 142=item $cf::NOW
124 143
125The time of the last (current) server tick. 144The time of the last (current) server tick.
126 145
127=item $cf::TICK 146=item $cf::TICK
128 147
129The interval between server ticks, in seconds. 148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG
151
152The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5.
155
156=item $cf::LOAD
157
158The raw value load value from the last tick.
130 159
131=item %cf::CFG 160=item %cf::CFG
132 161
133Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
134from wherever your confdir points to. 163from wherever your confdir points to.
135 164
136=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
137 166
138These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
139or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 168returns directly I<after> the tick processing (and consequently, can only wake one process
140processing has been done. Call C<< ->wait >> on them to maximise the 169per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
141window of cpu time available, or simply to synchronise to the server tick.
142 170
143=back 171=back
144 172
145=cut 173=cut
146 174
147BEGIN { 175BEGIN {
148 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
149 my $msg = join "", @_; 177 my $msg = join "", @_;
150 utf8::encode $msg;
151 178
152 $msg .= "\n" 179 $msg .= "\n"
153 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
154 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
155 LOG llevError, $msg; 185 LOG llevError, $msg;
156 }; 186 };
157} 187}
158 188
159@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
160@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
161@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
162@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
163@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 193@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
194@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
164@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 195@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
165 196
166# we bless all objects into (empty) derived classes to force a method lookup 197# we bless all objects into (empty) derived classes to force a method lookup
167# within the Safe compartment. 198# within the Safe compartment.
168for my $pkg (qw( 199for my $pkg (qw(
169 cf::global cf::attachable 200 cf::global cf::attachable
177} 208}
178 209
179$Event::DIED = sub { 210$Event::DIED = sub {
180 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
181}; 212};
213
214#############################################################################
182 215
183=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
184 217
185=over 4 218=over 4
186 219
205 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
206 $d 239 $d
207 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
208} 241}
209 242
210use JSON::Syck (); # TODO# replace by JSON::PC once working
211
212=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
213 244
214Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
215 246
216=cut
217
218sub from_json($) {
219 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220 JSON::Syck::Load $_[0]
221}
222
223=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
224 248
225Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
226 250
227=cut 251=cut
228 252
229sub to_json($) { 253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max
230 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
231 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
232} 256sub from_json ($) { $json_coder->decode ($_[0]) }
233 257
234=item cf::lock_wait $string 258=item cf::lock_wait $string
235 259
236Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
237 261
243returned. 267returned.
244 268
245Lock names should begin with a unique identifier (for example, cf::map::find 269Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
247 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
248=cut 276=cut
249 277
250our %LOCK; 278our %LOCK;
251 279
252sub lock_wait($) { 280sub lock_wait($) {
269 297
270 Coro::guard { 298 Coro::guard {
271 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
272 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
273 } 301 }
302}
303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
274} 308}
275 309
276sub freeze_mainloop { 310sub freeze_mainloop {
277 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
278 312
293 327
294BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
295 329
296=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
297 331
298The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
299always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
300reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable.
301 336
302If it must be done, put the blocking parts into C<sync_job>. This will run 337If it must be done, put the blocking parts into C<sync_job>. This will run
303the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
304server will be frozen during this time, so the block should either finish 339server will be frozen during this time, so the block should either finish
305fast or be very important. 340fast or be very important.
308 343
309sub sync_job(&) { 344sub sync_job(&) {
310 my ($job) = @_; 345 my ($job) = @_;
311 346
312 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
313 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
314 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
315 352
316 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
317 # (but this is cancel-safe) 354 # (but this is cancel-safe)
328 365
329 while ($busy) { 366 while ($busy) {
330 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
331 } 368 }
332 369
370 $time = Event::time - $time;
371
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load
376
333 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
334 } else { 378 } else {
335 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
336 380
337 $job->() 381 $job->()
356 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
357 401
358 $coro 402 $coro
359} 403}
360 404
361sub write_runtime { 405=item fork_call { }, $args
362 my $guard = cf::lock_acquire "write_runtime";
363 406
364 my $runtime = cf::localdir . "/runtime"; 407Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling.
365 411
366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 412=cut
367 or return;
368 413
369 my $value = $cf::RUNTIME + 90 + 10; 414sub fork_call(&@) {
370 # 10 is the runtime save interval, for a monotonic clock 415 my ($cb, @args) = @_;
371 # 60 allows for the watchdog to kill the server.
372 416
373 (aio_write $fh, 0, (length $value), $value, 0) <= 0 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
374 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
375 421
376 # always fsync - this file is important 422 if (my $pid = fork) {
377 aio_fsync $fh
378 and return;
379
380 close $fh 423 close $fh2;
381 or return;
382 424
383 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
384 and return; 426 $res = Coro::Storable::thaw $res;
385 427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
386 1 446 }
447}
448
449=item $value = cf::db_get $family => $key
450
451Returns a single value from the environment database.
452
453=item cf::db_put $family => $key => $value
454
455Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457
458=cut
459
460our $DB;
461
462sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477}
478
479sub db_get($$) {
480 my $key = "$_[0]/$_[1]";
481
482 cf::sync_job {
483 BDB::db_get $DB, undef, $key, my $data;
484
485 $! ? ()
486 : $data
487 }
488}
489
490sub db_put($$$) {
491 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
493}
494
495=item cf::cache $id => [$paths...], $processversion => $process
496
497Generic caching function that returns the value of the resource $id,
498caching and regenerating as required.
499
500This function can block.
501
502=cut
503
504sub cache {
505 my ($id, $src, $processversion, $process) = @_;
506
507 my $meta =
508 join "\x00",
509 $processversion,
510 map {
511 aio_stat $_
512 and Carp::croak "$_: $!";
513
514 ($_, (stat _)[7,9])
515 } @$src;
516
517 my $dbmeta = db_get cache => "$id/meta";
518 if ($dbmeta ne $meta) {
519 # changed, we may need to process
520
521 my @data;
522 my $md5;
523
524 for (0 .. $#$src) {
525 0 <= aio_load $src->[$_], $data[$_]
526 or Carp::croak "$src->[$_]: $!";
527 }
528
529 # if processing is expensive, check
530 # checksum first
531 if (1) {
532 $md5 =
533 join "\x00",
534 $processversion,
535 map {
536 Coro::cede;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src;
539
540
541 my $dbmd5 = db_get cache => "$id/md5";
542 if ($dbmd5 eq $md5) {
543 db_put cache => "$id/meta", $meta;
544
545 return db_get cache => "$id/data";
546 }
547 }
548
549 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time;
552
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
554
555 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta;
558
559 return $data;
560 }
561
562 db_get cache => "$id/data"
563}
564
565=item cf::datalog type => key => value, ...
566
567Log a datalog packet of the given type with the given key-value pairs.
568
569=cut
570
571sub datalog($@) {
572 my ($type, %kv) = @_;
573 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387} 574}
388 575
389=back 576=back
390 577
391=cut 578=cut
398attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
400 587
401In the following description, CLASS can be any of C<global>, C<object> 588In 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 589C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 590Crossfire TRT).
404 591
405=over 4 592=over 4
406 593
407=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
408 595
571 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
572 759
573 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 764
578 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 766 my $pkg = shift @arg;
580 767
581 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
611 } 798 }
612 799
613 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
614 } else { 801 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 803 }
617 804
618 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
619} 806}
620 807
622 if (ref $_[0]) { 809 if (ref $_[0]) {
623 _object_attach @_; 810 _object_attach @_;
624 } else { 811 } else {
625 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
626 } 813 }
814 _recalc_want;
627}; 815};
628 816
629# all those should be optimised 817# all those should be optimised
630sub cf::attachable::detach { 818sub cf::attachable::detach {
631 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
635 reattach ($obj); 823 reattach ($obj);
636 } else { 824 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
638 } 826 }
827 _recalc_want;
639}; 828};
640 829
641sub cf::attachable::attached { 830sub cf::attachable::attached {
642 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
643 832
816 or return; 1005 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1007 }
819 1008
820 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1011 return ($data, $av);
823} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
824 1019
825############################################################################# 1020#############################################################################
826# command handling &c 1021# command handling &c
827 1022
828=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1037}
843 1038
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1040
846Register a callbackf ro execution when the client sends an extcmd packet. 1041Register a callback for execution when the client sends an (synchronous)
1042extcmd packet. Ext commands will be processed in the order they are
1043received by the server, like other user commands. The first argument is
1044the logged-in player. Ext commands can only be processed after a player
1045has logged in successfully.
847 1046
848If the callback returns something, it is sent back as if reply was being 1047If the callback returns something, it is sent back as if reply was being
849called. 1048called.
850 1049
1050=item cf::register_exticmd $name => \&callback($ns,$packet);
1051
1052Register a callback for execution when the client sends an (asynchronous)
1053exticmd packet. Exti commands are processed by the server as soon as they
1054are received, i.e. out of order w.r.t. other commands. The first argument
1055is a client socket. Exti commands can be received anytime, even before
1056log-in.
1057
1058If the callback returns something, it is sent back as if reply was being
1059called.
1060
851=cut 1061=cut
852 1062
853sub register_extcmd { 1063sub register_extcmd {
854 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
855 1065
856 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
857} 1073}
858 1074
859cf::player->attach ( 1075cf::player->attach (
860 on_command => sub { 1076 on_command => sub {
861 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
886 1102
887 cf::override; 1103 cf::override;
888 }, 1104 },
889); 1105);
890 1106
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 { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
926 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1112 next unless -r $path;
928 eval { 1113
929 load_extension $ext; 1114 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1115 my $base = $1;
1116 my $pkg = $1;
1117 $pkg =~ s/[^[:word:]]/_/g;
1118 $pkg = "ext::$pkg";
1119
1120 open my $fh, "<:utf8", $path
1121 or die "$path: $!";
1122
1123 my $source = do { local $/; <$fh> };
1124
1125 my %ext = (
1126 path => $path,
1127 base => $base,
1128 pkg => $pkg,
1129 );
1130
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133
1134 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n"
1137 . $source
1138 . "\n};\n1";
1139
1140 $todo{$base} = \%ext;
1141 }
1142
1143 my %done;
1144 while (%todo) {
1145 my $progress;
1146
1147 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip
1150 unless exists $done{$_};
1151 }
1152
1153 warn "... loading '$k' into '$v->{pkg}'\n";
1154
1155 unless (eval $v->{source}) {
1156 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n";
1158
1159 if (exists $v->{meta}{mandatory}) {
1160 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n";
1162 exit 1;
1163 }
1164
1165 warn $msg;
1166 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
930 1 1171 }
931 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
932 } 1177 };
933} 1178}
934 1179
935############################################################################# 1180#############################################################################
936 1181
1182=back
1183
937=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
938 1185
939Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
940 1187
941=cut 1188=cut
953Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
954 1201
955=cut 1202=cut
956 1203
957sub playerdir($) { 1204sub playerdir($) {
958 cf::localdir 1205 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1207}
964 1208
965sub path($) { 1209sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1211
968 (playerdir $login) . "/$login.pl" 1212 (playerdir $login) . "/playerdata"
969} 1213}
970 1214
971sub find_active($) { 1215sub find_active($) {
972 $cf::PLAYER{$_[0]} 1216 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1217 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1230 my $login = $_[0];
987 1231
988 my $guard = cf::lock_acquire "user_find:$login"; 1232 my $guard = cf::lock_acquire "user_find:$login";
989 1233
990 $cf::PLAYER{$_[0]} || do { 1234 $cf::PLAYER{$_[0]} || do {
1235 # rename old playerfiles to new ones
1236 #TODO: remove when no longer required
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl";
1241
991 my $pl = load_pl path $login 1242 my $pl = load_pl path $login
992 or return; 1243 or return;
993 $cf::PLAYER{$login} = $pl 1244 $cf::PLAYER{$login} = $pl
994 } 1245 }
995 } 1246 }
1079while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1080 1331
1081=cut 1332=cut
1082 1333
1083sub list_logins { 1334sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1336 or return [];
1086 1337
1087 my @logins; 1338 my @logins;
1088 1339
1089 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1124 } 1375 }
1125 1376
1126 \@paths 1377 \@paths
1127} 1378}
1128 1379
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1381
1382Expand crossfire pod fragments into protocol xml.
1383
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1130 1414
1131Sends an ext reply to the player. 1415Sends an ext reply to the player.
1132 1416
1133=cut 1417=cut
1134 1418
1135sub ext_reply($$$%) { 1419sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1137 1421
1138 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1139
1140 $self->send ("ext " . cf::to_json \%msg); 1423 $self->send ("ext " . cf::to_json \%msg);
1141} 1424}
1142 1425
1143package cf; 1426=item $player->ext_event ($type, %msg)
1427
1428Sends an ext event to the client.
1429
1430=cut
1431
1432sub ext_event($$%) {
1433 my ($self, $type, %msg) = @_;
1434
1435 $self->ns->ext_event ($type, %msg);
1436}
1437
1438=head3 cf::region
1439
1440=over 4
1441
1442=cut
1443
1444package cf::region;
1445
1446=item cf::region::find_by_path $path
1447
1448Tries to decuce the likely region for a map knowing only its path.
1449
1450=cut
1451
1452sub find_by_path($) {
1453 my ($path) = @_;
1454
1455 my ($match, $specificity);
1456
1457 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) {
1459 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity;
1461 }
1462 }
1463
1464 $match
1465}
1144 1466
1145=back 1467=back
1146
1147 1468
1148=head3 cf::map 1469=head3 cf::map
1149 1470
1150=over 4 1471=over 4
1151 1472
1206 my ($self, $merge) = @_; 1527 my ($self, $merge) = @_;
1207 1528
1208 # we have to keep some variables in memory intact 1529 # we have to keep some variables in memory intact
1209 local $self->{path}; 1530 local $self->{path};
1210 local $self->{load_path}; 1531 local $self->{load_path};
1211 local $self->{deny_save};
1212 local $self->{deny_reset};
1213 1532
1214 $self->SUPER::thawer_merge ($merge); 1533 $self->SUPER::thawer_merge ($merge);
1215} 1534}
1216 1535
1217sub normalise { 1536sub normalise {
1289 1608
1290# the original (read-only) location 1609# the original (read-only) location
1291sub load_path { 1610sub load_path {
1292 my ($self) = @_; 1611 my ($self) = @_;
1293 1612
1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1613 "$MAPDIR/$self->{path}.map"
1295} 1614}
1296 1615
1297# the temporary/swap location 1616# the temporary/swap location
1298sub save_path { 1617sub save_path {
1299 my ($self) = @_; 1618 my ($self) = @_;
1300 1619
1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1621 "$TMPDIR/$path.map"
1303} 1622}
1304 1623
1305# the unique path, undef == no special unique path 1624# the unique path, undef == no special unique path
1306sub uniq_path { 1625sub uniq_path {
1307 my ($self) = @_; 1626 my ($self) = @_;
1308 1627
1309 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1629 "$UNIQUEDIR/$path"
1311} 1630}
1312 1631
1313# and all this just because we cannot iterate over 1632# and all this just because we cannot iterate over
1314# all maps in C++... 1633# all maps in C++...
1315sub change_all_map_light { 1634sub change_all_map_light {
1316 my ($change) = @_; 1635 my ($change) = @_;
1317 1636
1318 $_->change_map_light ($change) 1637 $_->change_map_light ($change)
1319 for grep $_->outdoor, values %cf::MAP; 1638 for grep $_->outdoor, values %cf::MAP;
1639}
1640
1641sub decay_objects {
1642 my ($self) = @_;
1643
1644 return if $self->{deny_reset};
1645
1646 $self->do_decay_objects;
1320} 1647}
1321 1648
1322sub unlink_save { 1649sub unlink_save {
1323 my ($self) = @_; 1650 my ($self) = @_;
1324 1651
1382 $self->load_header_orig 1709 $self->load_header_orig
1383 or return; 1710 or return;
1384 $self->prepare_orig; 1711 $self->prepare_orig;
1385 } 1712 }
1386 1713
1714 $self->{deny_reset} = 1
1715 if $self->no_reset;
1716
1717 $self->default_region (cf::region::find_by_path $self->{path})
1718 unless $self->default_region;
1719
1387 1 1720 1
1388} 1721}
1389 1722
1390sub find; 1723sub find;
1391sub find { 1724sub find {
1403 $map->{last_save} = $cf::RUNTIME; 1736 $map->{last_save} = $cf::RUNTIME;
1404 1737
1405 $map->load_header 1738 $map->load_header
1406 or return; 1739 or return;
1407 1740
1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1409 # doing this can freeze the server in a sync job, obviously 1742 # doing this can freeze the server in a sync job, obviously
1410 #$cf::WAIT_FOR_TICK->wait; 1743 #$cf::WAIT_FOR_TICK->wait;
1411 $map->reset; 1744 $map->reset;
1412 undef $guard; 1745 undef $guard;
1413 return find $path; 1746 return find $path;
1424 my ($self) = @_; 1757 my ($self) = @_;
1425 1758
1426 local $self->{deny_reset} = 1; # loading can take a long time 1759 local $self->{deny_reset} = 1; # loading can take a long time
1427 1760
1428 my $path = $self->{path}; 1761 my $path = $self->{path};
1762
1763 {
1429 my $guard = cf::lock_acquire "map_load:$path"; 1764 my $guard = cf::lock_acquire "map_load:$path";
1430 1765
1431 return if $self->in_memory != cf::MAP_SWAPPED; 1766 return if $self->in_memory != cf::MAP_SWAPPED;
1432 1767
1433 $self->in_memory (cf::MAP_LOADING); 1768 $self->in_memory (cf::MAP_LOADING);
1434 1769
1435 $self->alloc; 1770 $self->alloc;
1436 1771
1437 $self->pre_load; 1772 $self->pre_load;
1438
1439 $self->_load_objects ($self->{load_path}, 1)
1440 or return;
1441
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443 if delete $self->{load_original};
1444
1445 if (my $uniq = $self->uniq_path) {
1446 utf8::encode $uniq;
1447 if (aio_open $uniq, O_RDONLY, 0) {
1448 $self->clear_unique_items;
1449 $self->_load_objects ($uniq, 0);
1450 }
1451 }
1452
1453 Coro::cede;
1454
1455 # now do the right thing for maps
1456 $self->link_multipart_objects;
1457
1458 unless ($self->{deny_activate}) {
1459 $self->decay_objects;
1460 $self->fix_auto_apply;
1461 $self->update_buttons;
1462 Coro::cede; 1773 Coro::cede;
1463 $self->set_darkness_map; 1774
1775 $self->_load_objects ($self->{load_path}, 1)
1776 or return;
1777
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original};
1780
1781 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) {
1784 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0);
1786 }
1787 }
1788
1789 Coro::cede;
1790 # now do the right thing for maps
1791 $self->link_multipart_objects;
1464 $self->difficulty ($self->estimate_difficulty) 1792 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 1793 unless $self->difficulty;
1466 Coro::cede; 1794 Coro::cede;
1795
1796 unless ($self->{deny_activate}) {
1797 $self->decay_objects;
1798 $self->fix_auto_apply;
1799 $self->update_buttons;
1800 Coro::cede;
1801 $self->set_darkness_map;
1802 Coro::cede;
1467 $self->activate; 1803 $self->activate;
1804 }
1805
1806 $self->in_memory (cf::MAP_IN_MEMORY);
1468 } 1807 }
1469 1808
1470 $self->post_load; 1809 $self->post_load;
1471
1472 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 1810}
1474 1811
1475sub customise_for { 1812sub customise_for {
1476 my ($self, $ob) = @_; 1813 my ($self, $ob) = @_;
1477 1814
1478 return find "~" . $ob->name . "/" . $self->{path} 1815 return find "~" . $ob->name . "/" . $self->{path}
1479 if $self->per_player; 1816 if $self->per_player;
1817
1818# return find "?party/" . $ob->name . "/" . $self->{path}
1819# if $self->per_party;
1480 1820
1481 $self 1821 $self
1482} 1822}
1483 1823
1484# find and load all maps in the 3x3 area around a map 1824# find and load all maps in the 3x3 area around a map
1595 1935
1596sub reset_at { 1936sub reset_at {
1597 my ($self) = @_; 1937 my ($self) = @_;
1598 1938
1599 # TODO: safety, remove and allow resettable per-player maps 1939 # TODO: safety, remove and allow resettable per-player maps
1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1601 return 1e99 if $self->{deny_reset}; 1940 return 1e99 if $self->{deny_reset};
1602 1941
1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1942 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1604 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1943 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1605 1944
1616 my ($self) = @_; 1955 my ($self) = @_;
1617 1956
1618 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1957 my $lock = cf::lock_acquire "map_data:$self->{path}";
1619 1958
1620 return if $self->players; 1959 return if $self->players;
1621 return if $self->isa ("ext::map_per_player");#d#
1622 1960
1623 warn "resetting map ", $self->path;#d# 1961 warn "resetting map ", $self->path;
1624 1962
1625 $self->in_memory (cf::MAP_SWAPPED); 1963 $self->in_memory (cf::MAP_SWAPPED);
1626 1964
1627 # need to save uniques path 1965 # need to save uniques path
1628 unless ($self->{deny_save}) { 1966 unless ($self->{deny_save}) {
1660 $cf::MAP{$self->path} = $self; 1998 $cf::MAP{$self->path} = $self;
1661 1999
1662 $self->reset; # polite request, might not happen 2000 $self->reset; # polite request, might not happen
1663} 2001}
1664 2002
2003=item $maps = cf::map::tmp_maps
2004
2005Returns an arrayref with all map paths of currently instantiated and saved
2006maps. May block.
2007
2008=cut
2009
2010sub tmp_maps() {
2011 [
2012 map {
2013 utf8::decode $_;
2014 /\.map$/
2015 ? normalise $_
2016 : ()
2017 } @{ aio_readdir $TMPDIR or [] }
2018 ]
2019}
2020
2021=item $maps = cf::map::random_maps
2022
2023Returns an arrayref with all map paths of currently instantiated and saved
2024random maps. May block.
2025
2026=cut
2027
2028sub random_maps() {
2029 [
2030 map {
2031 utf8::decode $_;
2032 /\.map$/
2033 ? normalise "?random/$_"
2034 : ()
2035 } @{ aio_readdir $RANDOMDIR or [] }
2036 ]
2037}
2038
1665=item cf::map::unique_maps 2039=item cf::map::unique_maps
1666 2040
1667Returns an arrayref of paths of all shared maps that have 2041Returns an arrayref of paths of all shared maps that have
1668instantiated unique items. May block. 2042instantiated unique items. May block.
1669 2043
1670=cut 2044=cut
1671 2045
1672sub unique_maps() { 2046sub unique_maps() {
1673 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2047 [
1674 or return; 2048 map {
1675
1676 my @paths;
1677
1678 for (@$files) {
1679 utf8::decode $_; 2049 utf8::decode $_;
1680 next if /\.pst$/; 2050 /\.map$/
1681 next unless /^$PATH_SEP/o; 2051 ? normalise $_
1682 2052 : ()
1683 push @paths, cf::map::normalise $_; 2053 } @{ aio_readdir $UNIQUEDIR or [] }
1684 } 2054 ]
1685
1686 \@paths
1687} 2055}
1688 2056
1689package cf; 2057package cf;
1690 2058
1691=back 2059=back
1737 2105
1738 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1739 2107
1740 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
1741 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
1742 } else { 2111 } else {
2112 my $pl = $self->contr;
2113
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply (
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122
2123 } else {
1743 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
1744 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
1745 } 2127 }
1746} 2128}
1747 2129
1748=item $player_object->may ("access") 2130=item $player_object->may ("access")
1749 2131
1797 $self->deactivate_recursive; 2179 $self->deactivate_recursive;
1798 2180
1799 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2181 return if UNIVERSAL::isa $self->map, "ext::map_link";
1800 2182
1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802 if $self->map; 2184 if $self->map && $self->map->{path} ne "{link}";
1803 2185
1804 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2186 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1805} 2187}
1806 2188
1807sub cf::object::player::leave_link { 2189sub cf::object::player::leave_link {
1808 my ($self, $map, $x, $y) = @_; 2190 my ($self, $map, $x, $y) = @_;
2191
2192 return unless $self->contr->active;
1809 2193
1810 my $link_pos = delete $self->{_link_pos}; 2194 my $link_pos = delete $self->{_link_pos};
1811 2195
1812 unless ($map) { 2196 unless ($map) {
1813 # restore original map position 2197 # restore original map position
1836 2220
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838 $self->enter_map ($map, $x, $y); 2222 $self->enter_map ($map, $x, $y);
1839} 2223}
1840 2224
1841cf::player->attach (
1842 on_logout => sub {
1843 my ($pl) = @_;
1844
1845 # abort map switching before logout
1846 if ($pl->ob->{_link_pos}) {
1847 cf::sync_job {
1848 $pl->ob->leave_link
1849 };
1850 }
1851 },
1852 on_login => sub {
1853 my ($pl) = @_;
1854
1855 # try to abort aborted map switching on player login :)
1856 # should happen only on crashes
1857 if ($pl->ob->{_link_pos}) {
1858 $pl->ob->enter_link;
1859 (async {
1860 $pl->ob->reply (undef,
1861 "There was an internal problem at your last logout, "
1862 . "the server will try to bring you to your intended destination in a second.",
1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1866 Coro::Timer::sleep 1;
1867 $pl->ob->leave_link;
1868 })->prio (2);
1869 }
1870 },
1871);
1872
1873=item $player_object->goto ($path, $x, $y) 2225=item $player_object->goto ($path, $x, $y[, $check->($map)])
1874 2226
2227Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position.
2231
1875=cut 2232=cut
2233
2234our $GOTOGEN;
1876 2235
1877sub cf::object::player::goto { 2236sub cf::object::player::goto {
1878 my ($self, $path, $x, $y) = @_; 2237 my ($self, $path, $x, $y, $check) = @_;
2238
2239 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1879 2241
1880 $self->enter_link; 2242 $self->enter_link;
1881 2243
1882 (async { 2244 (async {
1883 my $map = eval { 2245 my $map = eval {
1884 my $map = cf::map::find $path; 2246 my $map = cf::map::find $path;
2247
2248 if ($map) {
1885 $map = $map->customise_for ($self) if $map; 2249 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map;
2251 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2253 }
2254
1886 $map 2255 $map
2256 };
2257
2258 if ($@) {
2259 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2260 LOG llevError | logBacktrace, Carp::longmess $@;
1887 } or 2261 }
1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889 2262
2263 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation};
1890 $self->leave_link ($map, $x, $y); 2265 $self->leave_link ($map, $x, $y);
2266 }
1891 })->prio (1); 2267 })->prio (1);
1892} 2268}
1893 2269
1894=item $player_object->enter_exit ($exit_object) 2270=item $player_object->enter_exit ($exit_object)
1895 2271
1934 2310
1935 $rmp->{random_seed} ||= $exit->random_seed; 2311 $rmp->{random_seed} ||= $exit->random_seed;
1936 2312
1937 my $data = cf::to_json $rmp; 2313 my $data = cf::to_json $rmp;
1938 my $md5 = Digest::MD5::md5_hex $data; 2314 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2315 my $meta = "$RANDOMDIR/$md5.meta";
1940 2316
1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942 aio_write $fh, 0, (length $data), $data, 0; 2318 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh; 2319 undef $fh;
1944 aio_rename "$meta~", $meta; 2320 aio_rename "$meta~", $meta;
1953 2329
1954 return unless $self->type == cf::PLAYER; 2330 return unless $self->type == cf::PLAYER;
1955 2331
1956 if ($exit->slaying eq "/!") { 2332 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2336 cf::sync_job { prepare_random_map $exit };
1959 } 2337 }
1960 2338
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2340 my $hp = $exit->stats->hp;
1970 $self->goto ($slaying, $hp, $sp); 2348 $self->goto ($slaying, $hp, $sp);
1971 2349
1972 1; 2350 1;
1973 }) { 2351 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2352 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2353 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2354 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2355 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2356
1979 warn "ERROR in enter_exit: $@"; 2357 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2358 $self->leave_link;
1981 } 2359 }
1982 })->prio (1); 2360 })->prio (1);
1995 2373
1996sub cf::client::send_drawinfo { 2374sub cf::client::send_drawinfo {
1997 my ($self, $text, $flags) = @_; 2375 my ($self, $text, $flags) = @_;
1998 2376
1999 utf8::encode $text; 2377 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2379}
2002 2380
2381=item $client->send_msg ($color, $type, $msg, [extra...])
2382
2383Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet.
2387
2388=cut
2389
2390sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_;
2392
2393 $msg = $self->pl->expand_cfpod ($msg);
2394
2395 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) {
2409 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg")
2414 }
2415 }
2416 }
2417}
2418
2419=item $client->ext_event ($type, %msg)
2420
2421Sends an ext event to the client.
2422
2423=cut
2424
2425sub cf::client::ext_event($$%) {
2426 my ($self, $type, %msg) = @_;
2427
2428 $msg{msgtype} = "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg);
2430}
2003 2431
2004=item $success = $client->query ($flags, "text", \&cb) 2432=item $success = $client->query ($flags, "text", \&cb)
2005 2433
2006Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2435the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2008C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2436C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2009 2437
2010Queries can fail, so check the return code. Or don't, as queries will become 2438Queries can fail, so check the return code. Or don't, as queries will
2011reliable at some point in the future. 2439become reliable at some point in the future.
2012 2440
2013=cut 2441=cut
2014 2442
2015sub cf::client::query { 2443sub cf::client::query {
2016 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
2024 utf8::encode $text; 2452 utf8::encode $text;
2025 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2026 2454
2027 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2028 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2029} 2459}
2030 2460
2031cf::client->attach ( 2461cf::client->attach (
2032 on_reply => sub { 2462 on_reply => sub {
2033 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
2048 } else { 2478 } else {
2049 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2050 } 2480 }
2051 } 2481 }
2052 }, 2482 },
2483 on_exticmd => sub {
2484 my ($ns, $buf) = @_;
2485
2486 my $msg = eval { from_json $buf };
2487
2488 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 }
2495 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 }
2498
2499 cf::override;
2500 },
2053); 2501);
2054 2502
2055=item $client->async (\&cb) 2503=item $client->async (\&cb)
2056 2504
2057Create a new coroutine, running the specified callback. The coroutine will 2505Create a new coroutine, running the specified callback. The coroutine will
2104 2552
2105# here we export the classes and methods available to script code 2553# here we export the classes and methods available to script code
2106 2554
2107=pod 2555=pod
2108 2556
2109The following fucntions and emthods are available within a safe environment: 2557The following functions and methods are available within a safe environment:
2110 2558
2111 cf::object contr pay_amount pay_player map 2559 cf::object contr pay_amount pay_player map
2112 cf::object::player player 2560 cf::object::player player
2113 cf::player peaceful 2561 cf::player peaceful
2114 cf::map trigger 2562 cf::map trigger
2195=back 2643=back
2196 2644
2197=cut 2645=cut
2198 2646
2199############################################################################# 2647#############################################################################
2200
2201=head2 EXTENSION DATABASE SUPPORT
2202
2203Crossfire maintains a very simple database for extension use. It can
2204currently store anything that can be serialised using Storable, which
2205excludes objects.
2206
2207The parameter C<$family> should best start with the name of the extension
2208using it, it should be unique.
2209
2210=over 4
2211
2212=item $value = cf::db_get $family => $key
2213
2214Returns a single value from the database.
2215
2216=item cf::db_put $family => $key => $value
2217
2218Stores the given C<$value> in the family.
2219
2220=cut
2221
2222our $DB;
2223
2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2243
2244 cf::db_put (board => data => $pst->{board});
2245 cf::db_put (guildrules => data => $pst->{guildrules});
2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249 unlink $path;
2250 };
2251 }
2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions 2648# the server's init and main functions
2273 2649
2274sub load_faces { 2650sub load_facedata($) {
2275 my $path = sprintf "%s/faces", cf::datadir; 2651 my ($path) = @_;
2276 2652
2277 warn "loading faces from $path\n"; 2653 warn "loading facedata from $path\n";
2278 2654
2279 my $faces; 2655 my $facedata;
2280 0 < aio_load $path, $faces 2656 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2657 or die "$path: $!";
2282 2658
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2659 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2660
2661 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663
2664 {
2665 my $faces = $facedata->{faceinfo};
2666
2287 while (my ($face, $info) = each %$faces) { 2667 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2668 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2291 Coro::cede; 2672 Coro::cede;
2673 }
2674
2675 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth};
2677 my $idx = cf::face::find $face
2678 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) {
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2681 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 }
2684 Coro::cede;
2685 }
2686 }
2687
2688 {
2689 my $anims = $facedata->{animinfo};
2690
2691 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede;
2694 }
2695
2696 cf::anim::invalidate_all; # d'oh
2292 } 2697 }
2293 2698
2294 1 2699 1
2295} 2700}
2296 2701
2702sub reload_regions {
2703 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n";
2705}
2706
2707sub reload_facedata {
2708 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n";
2710}
2711
2712sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n";
2715 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720}
2721
2722sub reload_treasures {
2723 load_resource_file "$DATADIR/treasures"
2724 or die "unable to load treasurelists\n";
2725}
2726
2297sub reload_resources { 2727sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2728 warn "reloading resource files...\n";
2299 or die "unable to load regions file\n";#d# 2729
2730 reload_regions;
2300 load_faces 2731 reload_facedata;
2301 or die "unable to load faces\n";#d# 2732 #reload_archetypes;#d#
2733 reload_archetypes;
2734 reload_treasures;
2735
2736 warn "finished reloading resource files\n";
2302} 2737}
2303 2738
2304sub init { 2739sub init {
2305 reload_resources; 2740 reload_resources;
2306} 2741}
2307 2742
2308sub cfg_load { 2743sub cfg_load {
2309 open my $fh, "<:utf8", cf::confdir . "/config" 2744 open my $fh, "<:utf8", "$CONFDIR/config"
2310 or return; 2745 or return;
2311 2746
2312 local $/; 2747 local $/;
2313 *CFG = YAML::Syck::Load <$fh>; 2748 *CFG = YAML::Syck::Load <$fh>;
2314 2749
2359 }, 2794 },
2360 ); 2795 );
2361 } 2796 }
2362} 2797}
2363 2798
2799sub write_runtime {
2800 my $runtime = "$LOCALDIR/runtime";
2801
2802 # first touch the runtime file to show we are still running:
2803 # the fsync below can take a very very long time.
2804
2805 IO::AIO::aio_utime $runtime, undef, undef;
2806
2807 my $guard = cf::lock_acquire "write_runtime";
2808
2809 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2810 or return;
2811
2812 my $value = $cf::RUNTIME + 90 + 10;
2813 # 10 is the runtime save interval, for a monotonic clock
2814 # 60 allows for the watchdog to kill the server.
2815
2816 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2817 and return;
2818
2819 # always fsync - this file is important
2820 aio_fsync $fh
2821 and return;
2822
2823 # touch it again to show we are up-to-date
2824 aio_utime $fh, undef, undef;
2825
2826 close $fh
2827 or return;
2828
2829 aio_rename "$runtime~", $runtime
2830 and return;
2831
2832 warn "runtime file written.\n";
2833
2834 1
2835}
2836
2364sub emergency_save() { 2837sub emergency_save() {
2365 my $freeze_guard = cf::freeze_mainloop; 2838 my $freeze_guard = cf::freeze_mainloop;
2366 2839
2367 warn "enter emergency perl save\n"; 2840 warn "enter emergency perl save\n";
2368 2841
2399 2872
2400 warn Carp::longmess "post_cleanup backtrace" 2873 warn Carp::longmess "post_cleanup backtrace"
2401 if $make_core; 2874 if $make_core;
2402} 2875}
2403 2876
2404sub reload() { 2877sub do_reload_perl() {
2405 # can/must only be called in main 2878 # can/must only be called in main
2406 if ($Coro::current != $Coro::main) { 2879 if ($Coro::current != $Coro::main) {
2407 warn "can only reload from main coroutine"; 2880 warn "can only reload from main coroutine";
2408 return; 2881 return;
2409 } 2882 }
2443 %EXT_CORO = (); 2916 %EXT_CORO = ();
2444 2917
2445 warn "removing commands"; 2918 warn "removing commands";
2446 %COMMAND = (); 2919 %COMMAND = ();
2447 2920
2448 warn "removing ext commands"; 2921 warn "removing ext/exti commands";
2449 %EXTCMD = (); 2922 %EXTCMD = ();
2923 %EXTICMD = ();
2450 2924
2451 warn "unloading/nuking all extensions"; 2925 warn "unloading/nuking all extensions";
2452 for my $pkg (@EXTS) { 2926 for my $pkg (@EXTS) {
2453 warn "... unloading $pkg"; 2927 warn "... unloading $pkg";
2454 2928
2484 Symbol::delete_package "safe::$_" 2958 Symbol::delete_package "safe::$_"
2485 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2486 2960
2487 warn "unloading cf.pm \"a bit\""; 2961 warn "unloading cf.pm \"a bit\"";
2488 delete $INC{"cf.pm"}; 2962 delete $INC{"cf.pm"};
2963 delete $INC{"cf/pod.pm"};
2489 2964
2490 # don't, removes xs symbols, too, 2965 # don't, removes xs symbols, too,
2491 # and global variables created in xs 2966 # and global variables created in xs
2492 #Symbol::delete_package __PACKAGE__; 2967 #Symbol::delete_package __PACKAGE__;
2493 2968
2508 warn "reattaching attachments to maps"; 2983 warn "reattaching attachments to maps";
2509 reattach $_ for values %MAP; 2984 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players"; 2985 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER; 2986 reattach $_ for values %PLAYER;
2512 2987
2513 warn "loading reloadable resources";
2514 reload_resources;
2515
2516 warn "leaving sync_job"; 2988 warn "leaving sync_job";
2517 2989
2518 1 2990 1
2519 } or do { 2991 } or do {
2520 warn $@; 2992 warn $@;
2525 warn "reloaded"; 2997 warn "reloaded";
2526}; 2998};
2527 2999
2528our $RELOAD_WATCHER; # used only during reload 3000our $RELOAD_WATCHER; # used only during reload
2529 3001
3002sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here.
3005
3006 $RELOAD_WATCHER ||= Event->timer (
3007 reentrant => 0,
3008 after => 0,
3009 data => WF_AUTOCANCEL,
3010 cb => sub {
3011 do_reload_perl;
3012 undef $RELOAD_WATCHER;
3013 },
3014 );
3015}
3016
2530register_command "reload" => sub { 3017register_command "reload" => sub {
2531 my ($who, $arg) = @_; 3018 my ($who, $arg) = @_;
2532 3019
2533 if ($who->flag (FLAG_WIZ)) { 3020 if ($who->flag (FLAG_WIZ)) {
2534 $who->message ("reloading server."); 3021 $who->message ("reloading server.");
2535 3022 async { reload_perl };
2536 # doing reload synchronously and two reloads happen back-to-back,
2537 # coro crashes during coro_state_free->destroy here.
2538
2539 $RELOAD_WATCHER ||= Event->timer (
2540 reentrant => 0,
2541 after => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => sub {
2544 reload;
2545 undef $RELOAD_WATCHER;
2546 },
2547 );
2548 } 3023 }
2549}; 3024};
2550 3025
2551unshift @INC, $LIBDIR; 3026unshift @INC, $LIBDIR;
2552 3027
2553my $bug_warning = 0; 3028my $bug_warning = 0;
2554 3029
3030our @WAIT_FOR_TICK;
3031our @WAIT_FOR_TICK_BEGIN;
3032
3033sub wait_for_tick {
3034 return unless $TICK_WATCHER->is_active;
3035 return if $Coro::current == $Coro::main;
3036
3037 my $signal = new Coro::Signal;
3038 push @WAIT_FOR_TICK, $signal;
3039 $signal->wait;
3040}
3041
3042sub wait_for_tick_begin {
3043 return unless $TICK_WATCHER->is_active;
3044 return if $Coro::current == $Coro::main;
3045
3046 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait;
3049}
3050
3051 my $min = 1e6;#d#
3052 my $avg = 10;
2555$TICK_WATCHER = Event->timer ( 3053$TICK_WATCHER = Event->timer (
2556 reentrant => 0, 3054 reentrant => 0,
2557 parked => 1, 3055 parked => 1,
2558 prio => 0, 3056 prio => 0,
2559 at => $NEXT_TICK || $TICK, 3057 at => $NEXT_TICK || $TICK,
2563 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3061 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2564 unless ++$bug_warning > 10; 3062 unless ++$bug_warning > 10;
2565 return; 3063 return;
2566 } 3064 }
2567 3065
2568 $NOW = Event::time; 3066 $NOW = $tick_start = Event::time;
2569 3067
2570 cf::server_tick; # one server iteration 3068 cf::server_tick; # one server iteration
3069
3070 0 && sync_job {#d#
3071 for(1..10) {
3072 my $t = Event::time;
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3074 or die;
3075
3076 $map->width (50);
3077 $map->height (50);
3078 $map->alloc;
3079 $map->_load_objects ("/tmp/x.map", 1);
3080 my $t = Event::time - $t;
3081
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 };
3092
2571 $RUNTIME += $TICK; 3093 $RUNTIME += $TICK;
2572 $NEXT_TICK += $TICK; 3094 $NEXT_TICK += $TICK;
2573 3095
2574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
2577 write_runtime 3099 write_runtime
2578 or warn "ERROR: unable to write runtime file: $!"; 3100 or warn "ERROR: unable to write runtime file: $!";
2579 }; 3101 };
2580 } 3102 }
2581 3103
2582 $WAIT_FOR_TICK->broadcast;
2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2584
2585# my $AFTER = Event::time; 3104# my $AFTER = Event::time;
2586# warn $AFTER - $NOW;#d# 3105# warn $AFTER - $NOW;#d#
2587 3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send;
3109 }
3110 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send;
3112 }
3113
3114 $NOW = Event::time;
3115
2588 # if we are delayed by four ticks or more, skip them all 3116 # if we are delayed by four ticks or more, skip them all
2589 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2590 3118
2591 $TICK_WATCHER->at ($NEXT_TICK); 3119 $TICK_WATCHER->at ($NEXT_TICK);
2592 $TICK_WATCHER->start; 3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124
3125 _post_tick;
3126
3127
2593 }, 3128 },
2594); 3129);
2595 3130
2596{ 3131{
2597 BDB::max_poll_time $TICK * 0.1; 3132 BDB::max_poll_time $TICK * 0.1;
2625 3160
2626 cf::sync_job { 3161 cf::sync_job {
2627 eval { 3162 eval {
2628 BDB::db_env_open 3163 BDB::db_env_open
2629 $DB_ENV, 3164 $DB_ENV,
2630 $BDB_ENV_DIR, 3165 $BDBDIR,
2631 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3166 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2632 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2633 0666; 3168 0666;
2634 3169
2635 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2636 3171
2637 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2638 $DB_ENV->set_lk_detect; 3173 $DB_ENV->set_lk_detect;
2639 }; 3174 };
2640 3175
2656 prio => 6, 3191 prio => 6,
2657 cb => \&IO::AIO::poll_cb, 3192 cb => \&IO::AIO::poll_cb,
2658 ); 3193 );
2659} 3194}
2660 3195
3196my $_log_backtrace;
3197
3198sub _log_backtrace {
3199 my ($msg, @addr) = @_;
3200
3201 $msg =~ s/\n//;
3202
3203 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) {
3205 ++$_log_backtrace;
3206 async {
3207 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3211 or die "addr2line: $!";
3212
3213 my @funcs;
3214 my @res = <$fh>;
3215 chomp for @res;
3216 while (@res) {
3217 my ($func, $line) = splice @res, 0, 2, ();
3218 push @funcs, "[$func] $line";
3219 }
3220
3221 @funcs
3222 };
3223
3224 LOG llevInfo, "[ABT] $msg\n";
3225 LOG llevInfo, "[ABT] $_\n" for @bt;
3226 --$_log_backtrace;
3227 };
3228 } else {
3229 LOG llevInfo, "[ABT] $msg\n";
3230 LOG llevInfo, "[ABT] [suppressed]\n";
3231 }
3232}
3233
3234# load additional modules
3235use cf::pod;
3236
2661END { cf::emergency_save } 3237END { cf::emergency_save }
2662 3238
26631 32391
2664 3240

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines