ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines