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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.284 by root, Sun Jun 24 04:15:42 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.3 (); 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
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 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
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use 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
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# 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?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$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
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 76our $NEXT_TICK;
50our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
51 82
52our %CFG; 83our %CFG;
53 84
54our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 86our $RUNTIME;
56 87
57our %PLAYER; # all users 88our %PLAYER; # all users
58our %MAP; # all maps 89our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 91
65# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
68binmode STDOUT; 99binmode STDOUT;
69binmode STDERR; 100binmode STDERR;
70 101
71# read virtual server time, if available 102# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
76} 107}
77 108
78mkdir cf::localdir; 109mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 111
84our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
85 115
86############################################################################# 116#############################################################################
87 117
88=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
89 119
96=item $cf::RUNTIME 126=item $cf::RUNTIME
97 127
98The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 129every server tick.
100 130
101=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 134
103The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
105 139
106=item $cf::NOW 140=item $cf::NOW
107 141
108The time of the last (current) server tick. 142The time of the last (current) server tick.
109 143
110=item $cf::TICK 144=item $cf::TICK
111 145
112The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
113 157
114=item %cf::CFG 158=item %cf::CFG
115 159
116Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 161from wherever your confdir points to.
118 162
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
120 164
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick.
125 168
126=back 169=back
127 170
128=cut 171=cut
129 172
130BEGIN { 173BEGIN {
131 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 175 my $msg = join "", @_;
133 utf8::encode $msg;
134 176
135 $msg .= "\n" 177 $msg .= "\n"
136 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
137 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
138 LOG llevError, $msg; 183 LOG llevError, $msg;
139 }; 184 };
140} 185}
141 186
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
144@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
145@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
146@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
147@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
148 194
149# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
150# within the Safe compartment. 196# within the Safe compartment.
151for my $pkg (qw( 197for my $pkg (qw(
152 cf::global cf::attachable 198 cf::global cf::attachable
160} 206}
161 207
162$Event::DIED = sub { 208$Event::DIED = sub {
163 warn "error in event callback: @_"; 209 warn "error in event callback: @_";
164}; 210};
211
212#############################################################################
165 213
166=head2 UTILITY FUNCTIONS 214=head2 UTILITY FUNCTIONS
167 215
168=over 4 216=over 4
169 217
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 237 $d
190 } || "[unable to dump $_[0]: '$@']"; 238 } || "[unable to dump $_[0]: '$@']";
191} 239}
192 240
193use JSON::Syck (); # TODO# replace by JSON::PC once working 241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
194 242
195=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
196 244
197Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
198 246
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
207 248
208Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
209
210=cut
211
212sub to_json($) {
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
214 JSON::Syck::Dump $_[0]
215}
216 250
217=item cf::lock_wait $string 251=item cf::lock_wait $string
218 252
219Wait until the given lock is available. See cf::lock_acquire. 253Wait until the given lock is available. See cf::lock_acquire.
220 254
226returned. 260returned.
227 261
228Lock names should begin with a unique identifier (for example, cf::map::find 262Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 263uses map_find and cf::map::load uses map_load).
230 264
265=item $locked = cf::lock_active $string
266
267Return true if the lock is currently active, i.e. somebody has locked it.
268
231=cut 269=cut
232 270
233our %LOCK; 271our %LOCK;
234 272
235sub lock_wait($) { 273sub lock_wait($) {
254 # wake up all waiters, to be on the safe side 292 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 293 $_->ready for @{ delete $LOCK{$key} };
256 } 294 }
257} 295}
258 296
297sub lock_active($) {
298 my ($key) = @_;
299
300 ! ! $LOCK{$key}
301}
302
259sub freeze_mainloop { 303sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 304 return unless $TICK_WATCHER->is_active;
261 305
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 306 my $guard = Coro::guard {
307 $TICK_WATCHER->start;
308 };
263 $TICK_WATCHER->stop; 309 $TICK_WATCHER->stop;
264 $guard 310 $guard
265} 311}
266 312
267=item cf::async { BLOCK } 313=item cf::async { BLOCK }
274 320
275BEGIN { *async = \&Coro::async_pool } 321BEGIN { *async = \&Coro::async_pool }
276 322
277=item cf::sync_job { BLOCK } 323=item cf::sync_job { BLOCK }
278 324
279The design of crossfire+ requires that the main coro ($Coro::main) is 325The design of Crossfire TRT requires that the main coroutine ($Coro::main)
280always able to handle events or runnable, as crossfire+ is only partly 326is always able to handle events or runnable, as Crossfire TRT is only
281reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable.
282 329
283If it must be done, put the blocking parts into C<sync_job>. This will run 330If it must be done, put the blocking parts into C<sync_job>. This will run
284the given BLOCK in another coroutine while waiting for the result. The 331the given BLOCK in another coroutine while waiting for the result. The
285server will be frozen during this time, so the block should either finish 332server will be frozen during this time, so the block should either finish
286fast or be very important. 333fast or be very important.
289 336
290sub sync_job(&) { 337sub sync_job(&) {
291 my ($job) = @_; 338 my ($job) = @_;
292 339
293 if ($Coro::current == $Coro::main) { 340 if ($Coro::current == $Coro::main) {
341 my $time = Event::time;
342
294 # this is the main coro, too bad, we have to block 343 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/ 344 # till the operation succeeds, freezing the server :/
296 345
297 # TODO: use suspend/resume instead 346 # TODO: use suspend/resume instead
298 # (but this is cancel-safe) 347 # (but this is cancel-safe)
309 358
310 while ($busy) { 359 while ($busy) {
311 Coro::cede or Event::one_event; 360 Coro::cede or Event::one_event;
312 } 361 }
313 362
363 $time = Event::time - $time;
364
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load
369
314 wantarray ? @res : $res[0] 370 wantarray ? @res : $res[0]
315 } else { 371 } else {
316 # we are in another coroutine, how wonderful, everything just works 372 # we are in another coroutine, how wonderful, everything just works
317 373
318 $job->() 374 $job->()
337 $EXT_CORO{$coro+0} = $coro; 393 $EXT_CORO{$coro+0} = $coro;
338 394
339 $coro 395 $coro
340} 396}
341 397
342sub write_runtime { 398=item fork_call { }, $args
343 return unless $TICK_WATCHER->is_active;
344 399
345 my $runtime = cf::localdir . "/runtime"; 400Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling.
346 404
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405=cut
348 or return;
349 406
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 407sub fork_call(&@) {
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 408 my ($cb, @args) = @_;
352 and return;
353 409
354 aio_fsync $fh 410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
355 and return; 411# or die "socketpair: $!";
412 pipe my $fh1, my $fh2
413 or die "pipe: $!";
356 414
415 if (my $pid = fork) {
357 close $fh 416 close $fh2;
358 or return;
359 417
360 aio_rename "$runtime~", $runtime 418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
361 and return; 419 $res = Coro::Storable::thaw $res;
362 420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
363 1 439 }
440}
441
442=item $value = cf::db_get $family => $key
443
444Returns a single value from the environment database.
445
446=item cf::db_put $family => $key => $value
447
448Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450
451=cut
452
453our $DB;
454
455sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 }
470}
471
472sub db_get($$) {
473 my $key = "$_[0]/$_[1]";
474
475 cf::sync_job {
476 BDB::db_get $DB, undef, $key, my $data;
477
478 $! ? ()
479 : $data
480 }
481}
482
483sub db_put($$$) {
484 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
486}
487
488=item cf::cache $id => [$paths...], $processversion => $process
489
490Generic caching function that returns the value of the resource $id,
491caching and regenerating as required.
492
493This function can block.
494
495=cut
496
497sub cache {
498 my ($id, $src, $processversion, $process) = @_;
499
500 my $meta =
501 join "\x00",
502 $processversion,
503 map {
504 aio_stat $_
505 and Carp::croak "$_: $!";
506
507 ($_, (stat _)[7,9])
508 } @$src;
509
510 my $dbmeta = db_get cache => "$id/meta";
511 if ($dbmeta ne $meta) {
512 # changed, we may need to process
513
514 my @data;
515 my $md5;
516
517 for (0 .. $#$src) {
518 0 <= aio_load $src->[$_], $data[$_]
519 or Carp::croak "$src->[$_]: $!";
520 }
521
522 # if processing is expensive, check
523 # checksum first
524 if (1) {
525 $md5 =
526 join "\x00",
527 $processversion,
528 map {
529 Coro::cede;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src;
532
533
534 my $dbmd5 = db_get cache => "$id/md5";
535 if ($dbmd5 eq $md5) {
536 db_put cache => "$id/meta", $meta;
537
538 return db_get cache => "$id/data";
539 }
540 }
541
542 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time;
545
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
547
548 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta;
551
552 return $data;
553 }
554
555 db_get cache => "$id/data"
556}
557
558=item cf::datalog type => key => value, ...
559
560Log a datalog packet of the given type with the given key-value pairs.
561
562=cut
563
564sub datalog($@) {
565 my ($type, %kv) = @_;
566 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 567}
365 568
366=back 569=back
367 570
368=cut 571=cut
375attach callbacks/event handlers (a collection of which is called an "attachment") 578attach callbacks/event handlers (a collection of which is called an "attachment")
376to it. All such attachable objects support the following methods. 579to it. All such attachable objects support the following methods.
377 580
378In the following description, CLASS can be any of C<global>, C<object> 581In the following description, CLASS can be any of C<global>, C<object>
379C<player>, C<client> or C<map> (i.e. the attachable objects in 582C<player>, C<client> or C<map> (i.e. the attachable objects in
380crossfire+). 583Crossfire TRT).
381 584
382=over 4 585=over 4
383 586
384=item $attachable->attach ($attachment, key => $value...) 587=item $attachable->attach ($attachment, key => $value...)
385 588
499our @CB_TYPE = (); # registry for type (cf-object class) based events 702our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 703our @CB_MAP = ();
501 704
502my %attachment; 705my %attachment;
503 706
707sub cf::attachable::thawer_merge {
708 # simply override everything except _meta
709 local $_[0]{_meta};
710 %{$_[0]} = %{$_[1]};
711}
712
504sub _attach_cb($$$$) { 713sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 714 my ($registry, $event, $prio, $cb) = @_;
506 715
507 use sort 'stable'; 716 use sort 'stable';
508 717
542 $registry = $CB_TYPE[$object_type] ||= []; 751 $registry = $CB_TYPE[$object_type] ||= [];
543 752
544 } elsif ($type eq "subtype") { 753 } elsif ($type eq "subtype") {
545 defined $object_type or Carp::croak "subtype specified without type"; 754 defined $object_type or Carp::croak "subtype specified without type";
546 my $object_subtype = shift @arg; 755 my $object_subtype = shift @arg;
547 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 756 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
548 757
549 } elsif ($type eq "package") { 758 } elsif ($type eq "package") {
550 my $pkg = shift @arg; 759 my $pkg = shift @arg;
551 760
552 while (my ($name, $id) = each %cb_id) { 761 while (my ($name, $id) = each %cb_id) {
581 _attach $registry, $klass, @attach; 790 _attach $registry, $klass, @attach;
582 } 791 }
583 792
584 $obj->{$name} = \%arg; 793 $obj->{$name} = \%arg;
585 } else { 794 } else {
586 warn "object uses attachment '$name' that is not available, postponing.\n"; 795 warn "object uses attachment '$name' which is not available, postponing.\n";
587 } 796 }
588 797
589 $obj->{_attachment}{$name} = undef; 798 $obj->{_attachment}{$name} = undef;
590} 799}
591 800
593 if (ref $_[0]) { 802 if (ref $_[0]) {
594 _object_attach @_; 803 _object_attach @_;
595 } else { 804 } else {
596 _attach shift->_attach_registry, @_; 805 _attach shift->_attach_registry, @_;
597 } 806 }
807 _recalc_want;
598}; 808};
599 809
600# all those should be optimised 810# all those should be optimised
601sub cf::attachable::detach { 811sub cf::attachable::detach {
602 my ($obj, $name) = @_; 812 my ($obj, $name) = @_;
605 delete $obj->{_attachment}{$name}; 815 delete $obj->{_attachment}{$name};
606 reattach ($obj); 816 reattach ($obj);
607 } else { 817 } else {
608 Carp::croak "cannot, currently, detach class attachments"; 818 Carp::croak "cannot, currently, detach class attachments";
609 } 819 }
820 _recalc_want;
610}; 821};
611 822
612sub cf::attachable::attached { 823sub cf::attachable::attached {
613 my ($obj, $name) = @_; 824 my ($obj, $name) = @_;
614 825
679# object support 890# object support
680 891
681sub reattach { 892sub reattach {
682 # basically do the same as instantiate, without calling instantiate 893 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 894 my ($obj) = @_;
895
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 897
685 my $registry = $obj->registry; 898 my $registry = $obj->registry;
686 899
687 @$registry = (); 900 @$registry = ();
688 901
735 $filename, length $$rdata, scalar @$objs; 948 $filename, length $$rdata, scalar @$objs;
736 949
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 951 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 952 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 953 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 954 close $fh;
742 955
743 if (@$objs) { 956 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 958 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 959 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 960 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 961 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 962 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 963 aio_rename "$filename.pst~", "$filename.pst";
751 } 964 }
752 } else { 965 } else {
753 aio_unlink "$filename.pst"; 966 aio_unlink "$filename.pst";
785 or return; 998 or return;
786 $av = eval { (Storable::thaw $av)->{objs} }; 999 $av = eval { (Storable::thaw $av)->{objs} };
787 } 1000 }
788 1001
789 warn sprintf "loading %s (%d)\n", 1002 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d# 1003 $filename, length $data, scalar @{$av || []};
791 return ($data, $av); 1004 return ($data, $av);
792} 1005}
1006
1007=head2 COMMAND CALLBACKS
1008
1009=over 4
1010
1011=cut
793 1012
794############################################################################# 1013#############################################################################
795# command handling &c 1014# command handling &c
796 1015
797=item cf::register_command $name => \&callback($ob,$args); 1016=item cf::register_command $name => \&callback($ob,$args);
810 push @{ $COMMAND{$name} }, [$caller, $cb]; 1029 push @{ $COMMAND{$name} }, [$caller, $cb];
811} 1030}
812 1031
813=item cf::register_extcmd $name => \&callback($pl,$packet); 1032=item cf::register_extcmd $name => \&callback($pl,$packet);
814 1033
815Register a callbackf ro execution when the client sends an extcmd packet. 1034Register a callback fro execution when the client sends an extcmd packet.
816 1035
817If the callback returns something, it is sent back as if reply was being 1036If the callback returns something, it is sent back as if reply was being
818called. 1037called.
819 1038
820=cut 1039=cut
855 1074
856 cf::override; 1075 cf::override;
857 }, 1076 },
858); 1077);
859 1078
860sub load_extension {
861 my ($path) = @_;
862
863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
864 my $base = $1;
865 my $pkg = $1;
866 $pkg =~ s/[^[:word:]]/_/g;
867 $pkg = "ext::$pkg";
868
869 warn "... loading '$path' into '$pkg'\n";
870
871 open my $fh, "<:utf8", $path
872 or die "$path: $!";
873
874 my $source =
875 "package $pkg; use strict; use utf8;\n"
876 . "#line 1 \"$path\"\n{\n"
877 . (do { local $/; <$fh> })
878 . "\n};\n1";
879
880 unless (eval $source) {
881 my $msg = $@ ? "$path: $@\n"
882 : "extension disabled.\n";
883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
884 warn $@;
885 warn "mandatory extension failed to load, exiting.\n";
886 exit 1;
887 }
888 die $@;
889 }
890
891 push @EXTS, $pkg;
892}
893
894sub load_extensions { 1079sub load_extensions {
1080 cf::sync_job {
1081 my %todo;
1082
895 for my $ext (<$LIBDIR/*.ext>) { 1083 for my $path (<$LIBDIR/*.ext>) {
896 next unless -r $ext; 1084 next unless -r $path;
897 eval { 1085
898 load_extension $ext; 1086 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1087 my $base = $1;
1088 my $pkg = $1;
1089 $pkg =~ s/[^[:word:]]/_/g;
1090 $pkg = "ext::$pkg";
1091
1092 open my $fh, "<:utf8", $path
1093 or die "$path: $!";
1094
1095 my $source = do { local $/; <$fh> };
1096
1097 my %ext = (
1098 path => $path,
1099 base => $base,
1100 pkg => $pkg,
1101 );
1102
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105
1106 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n"
1109 . $source
1110 . "\n};\n1";
1111
1112 $todo{$base} = \%ext;
1113 }
1114
1115 my %done;
1116 while (%todo) {
1117 my $progress;
1118
1119 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip
1122 unless exists $done{$_};
1123 }
1124
1125 warn "... loading '$k' into '$v->{pkg}'\n";
1126
1127 unless (eval $v->{source}) {
1128 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n";
1130
1131 if (exists $v->{meta}{mandatory}) {
1132 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n";
1134 exit 1;
1135 }
1136
1137 warn $msg;
1138 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
899 1 1143 }
900 } or warn "$ext not loaded: $@"; 1144
1145 skip:
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1147 unless $progress;
1148 }
901 } 1149 };
902} 1150}
903 1151
904############################################################################# 1152#############################################################################
905 1153
1154=back
1155
906=head2 CORE EXTENSIONS 1156=head2 CORE EXTENSIONS
907 1157
908Functions and methods that extend core crossfire objects. 1158Functions and methods that extend core crossfire objects.
909 1159
910=cut 1160=cut
922Returns the given player object, loading it if necessary (might block). 1172Returns the given player object, loading it if necessary (might block).
923 1173
924=cut 1174=cut
925 1175
926sub playerdir($) { 1176sub playerdir($) {
927 cf::localdir 1177 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1178 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 1179}
933 1180
934sub path($) { 1181sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1182 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 1183
937 (playerdir $login) . "/$login.pl" 1184 (playerdir $login) . "/playerdata"
938} 1185}
939 1186
940sub find_active($) { 1187sub find_active($) {
941 $cf::PLAYER{$_[0]} 1188 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 1189 and $cf::PLAYER{$_[0]}->active
945 1192
946sub exists($) { 1193sub exists($) {
947 my ($login) = @_; 1194 my ($login) = @_;
948 1195
949 $cf::PLAYER{$login} 1196 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 1197 or cf::sync_job { !aio_stat path $login }
951} 1198}
952 1199
953sub find($) { 1200sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1201 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1202 my $login = $_[0];
956 1203
957 my $guard = cf::lock_acquire "user_find:$login"; 1204 my $guard = cf::lock_acquire "user_find:$login";
958 1205
959 $cf::PLAYER{$_[0]} || do { 1206 $cf::PLAYER{$_[0]} || do {
1207 # rename old playerfiles to new ones
1208 #TODO: remove when no longer required
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl";
1213
960 my $pl = load_pl path $login 1214 my $pl = load_pl path $login
961 or return; 1215 or return;
962 $cf::PLAYER{$login} = $pl 1216 $cf::PLAYER{$login} = $pl
963 } 1217 }
964 } 1218 }
1001 1255
1002=cut 1256=cut
1003 1257
1004sub quit_character { 1258sub quit_character {
1005 my ($pl) = @_; 1259 my ($pl) = @_;
1260
1261 my $name = $pl->ob->name;
1006 1262
1007 $pl->{deny_save} = 1; 1263 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1264 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1265
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 my $path = playerdir $pl; 1271 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1272 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1273 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1274 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1275 $pl->destroy;
1276
1277 my $prefix = qr<^~\Q$name\E/>;
1278
1279 # nuke player maps
1280 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1281
1020 IO::AIO::aio_rmtree $temp; 1282 IO::AIO::aio_rmtree $temp;
1283}
1284
1285=item $pl->kick
1286
1287Kicks a player out of the game. This destroys the connection.
1288
1289=cut
1290
1291sub kick {
1292 my ($pl, $kicker) = @_;
1293
1294 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1295 $pl->killer ("kicked");
1296 $pl->ns->destroy;
1021} 1297}
1022 1298
1023=item cf::player::list_logins 1299=item cf::player::list_logins
1024 1300
1025Returns am arrayref of all valid playernames in the system, can take a 1301Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1302while and may block, so not sync_job-capable, ever.
1027 1303
1028=cut 1304=cut
1029 1305
1030sub list_logins { 1306sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1307 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1308 or return [];
1033 1309
1034 my @logins; 1310 my @logins;
1035 1311
1036 for my $login (@$dirs) { 1312 for my $login (@$dirs) {
1053=cut 1329=cut
1054 1330
1055sub maps($) { 1331sub maps($) {
1056 my ($pl) = @_; 1332 my ($pl) = @_;
1057 1333
1334 $pl = ref $pl ? $pl->ob->name : $pl;
1335
1058 my $files = aio_readdir playerdir $pl 1336 my $files = aio_readdir playerdir $pl
1059 or return; 1337 or return;
1060 1338
1061 my @paths; 1339 my @paths;
1062 1340
1063 for (@$files) { 1341 for (@$files) {
1064 utf8::decode $_; 1342 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1343 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1344 next unless /^$PATH_SEP/o;
1067 1345
1068 s/\.map$//; 1346 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1347 }
1071 1348
1072 \@paths 1349 \@paths
1073} 1350}
1074 1351
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1353
1354Expand crossfire pod fragments into protocol xml.
1355
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1385=item $player->ext_reply ($msgid, %msg)
1076 1386
1077Sends an ext reply to the player. 1387Sends an ext reply to the player.
1078 1388
1079=cut 1389=cut
1080 1390
1081sub ext_reply($$$%) { 1391sub ext_reply($$%) {
1082 my ($self, $id, %msg) = @_; 1392 my ($self, $id, %msg) = @_;
1083 1393
1084 $msg{msgid} = $id; 1394 $msg{msgid} = $id;
1085 1395
1086 $self->send ("ext " . cf::to_json \%msg); 1396 $self->send ("ext " . cf::to_json \%msg);
1087} 1397}
1088 1398
1089package cf; 1399=item $player->ext_event ($type, %msg)
1400
1401Sends an ext event to the client.
1402
1403=cut
1404
1405sub ext_event($$%) {
1406 my ($self, $type, %msg) = @_;
1407
1408 $self->ns->ext_event ($type, %msg);
1409}
1410
1411=head3 cf::region
1412
1413=over 4
1414
1415=cut
1416
1417package cf::region;
1418
1419=item cf::region::find_by_path $path
1420
1421Tries to decuce the likely region for a map knowing only its path.
1422
1423=cut
1424
1425sub find_by_path($) {
1426 my ($path) = @_;
1427
1428 my ($match, $specificity);
1429
1430 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) {
1432 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity;
1434 }
1435 }
1436
1437 $match
1438}
1090 1439
1091=back 1440=back
1092
1093 1441
1094=head3 cf::map 1442=head3 cf::map
1095 1443
1096=over 4 1444=over 4
1097 1445
1101 1449
1102use Fcntl; 1450use Fcntl;
1103use Coro::AIO; 1451use Coro::AIO;
1104 1452
1105use overload 1453use overload
1106 '""' => \&as_string; 1454 '""' => \&as_string,
1455 fallback => 1;
1107 1456
1108our $MAX_RESET = 3600; 1457our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1458our $DEFAULT_RESET = 3000;
1110 1459
1111sub generate_random_map { 1460sub generate_random_map {
1112 my ($self, $rmp) = @_; 1461 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1462 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1463 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1473 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1474 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1475 )
1128} 1476}
1129 1477
1478=item cf::map->register ($regex, $prio)
1479
1480Register a handler for the map path matching the given regex at the
1481givne priority (higher is better, built-in handlers have priority 0, the
1482default).
1483
1484=cut
1485
1130sub register { 1486sub register {
1131 my (undef, $regex) = @_; 1487 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1488 my $pkg = caller;
1133 1489
1134 no strict; 1490 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1491 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1492
1137 $EXT_MAP{$pkg} = qr<$regex>; 1493 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1494}
1139 1495
1140# also paths starting with '/' 1496# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1497$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1498
1499sub thawer_merge {
1500 my ($self, $merge) = @_;
1501
1502 # we have to keep some variables in memory intact
1503 local $self->{path};
1504 local $self->{load_path};
1505
1506 $self->SUPER::thawer_merge ($merge);
1507}
1142 1508
1143sub normalise { 1509sub normalise {
1144 my ($path, $base) = @_; 1510 my ($path, $base) = @_;
1511
1512 $path = "$path"; # make sure its a string
1513
1514 $path =~ s/\.map$//;
1145 1515
1146 # map plan: 1516 # map plan:
1147 # 1517 #
1148 # /! non-realised random map exit (special hack!) 1518 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1519 # {... are special paths that are not being touched
1177 1547
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1548 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1549
1180 $path = normalise $path, $base; 1550 $path = normalise $path, $base;
1181 1551
1182 for my $pkg (keys %EXT_MAP) { 1552 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1553 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1554 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1555 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1556 $self->init; # pass $1 etc.
1187 return $self; 1557 return $self;
1188 } 1558 }
1189 } 1559 }
1190 1560
1191 Carp::carp "unable to resolve path '$path'."; 1561 Carp::carp "unable to resolve path '$path' (base '$base').";
1192 () 1562 ()
1193} 1563}
1194 1564
1195sub init { 1565sub init {
1196 my ($self) = @_; 1566 my ($self) = @_;
1211 1581
1212# the original (read-only) location 1582# the original (read-only) location
1213sub load_path { 1583sub load_path {
1214 my ($self) = @_; 1584 my ($self) = @_;
1215 1585
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1586 "$MAPDIR/$self->{path}.map"
1217} 1587}
1218 1588
1219# the temporary/swap location 1589# the temporary/swap location
1220sub save_path { 1590sub save_path {
1221 my ($self) = @_; 1591 my ($self) = @_;
1222 1592
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1594 "$TMPDIR/$path.map"
1225} 1595}
1226 1596
1227# the unique path, undef == no special unique path 1597# the unique path, undef == no special unique path
1228sub uniq_path { 1598sub uniq_path {
1229 my ($self) = @_; 1599 my ($self) = @_;
1230 1600
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1602 "$UNIQUEDIR/$path"
1233} 1603}
1234 1604
1235# and all this just because we cannot iterate over 1605# and all this just because we cannot iterate over
1236# all maps in C++... 1606# all maps in C++...
1237sub change_all_map_light { 1607sub change_all_map_light {
1239 1609
1240 $_->change_map_light ($change) 1610 $_->change_map_light ($change)
1241 for grep $_->outdoor, values %cf::MAP; 1611 for grep $_->outdoor, values %cf::MAP;
1242} 1612}
1243 1613
1614sub decay_objects {
1615 my ($self) = @_;
1616
1617 return if $self->{deny_reset};
1618
1619 $self->do_decay_objects;
1620}
1621
1244sub unlink_save { 1622sub unlink_save {
1245 my ($self) = @_; 1623 my ($self) = @_;
1246 1624
1247 utf8::encode (my $save = $self->save_path); 1625 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1626 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1627 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1628}
1251 1629
1252sub load_header_from($) { 1630sub load_header_from($) {
1253 my ($self, $path) = @_; 1631 my ($self, $path) = @_;
1254 1632
1255 utf8::encode $path; 1633 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1634 #aio_open $path, O_RDONLY, 0
1257 or return; 1635 # or return;
1258 1636
1259 $self->_load_header ($path) 1637 $self->_load_header ($path)
1260 or return; 1638 or return;
1261 1639
1262 $self->{load_path} = $path; 1640 $self->{load_path} = $path;
1263 1641
1264 1 1642 1
1265} 1643}
1266 1644
1267sub load_orig { 1645sub load_header_orig {
1268 my ($self) = @_; 1646 my ($self) = @_;
1269 1647
1270 $self->load_header_from ($self->load_path) 1648 $self->load_header_from ($self->load_path)
1271} 1649}
1272 1650
1273sub load_temp { 1651sub load_header_temp {
1274 my ($self) = @_; 1652 my ($self) = @_;
1275 1653
1276 $self->load_header_from ($self->save_path) 1654 $self->load_header_from ($self->save_path)
1655}
1656
1657sub prepare_temp {
1658 my ($self) = @_;
1659
1660 $self->last_access ((delete $self->{last_access})
1661 || $cf::RUNTIME); #d#
1662 # safety
1663 $self->{instantiate_time} = $cf::RUNTIME
1664 if $self->{instantiate_time} > $cf::RUNTIME;
1665}
1666
1667sub prepare_orig {
1668 my ($self) = @_;
1669
1670 $self->{load_original} = 1;
1671 $self->{instantiate_time} = $cf::RUNTIME;
1672 $self->last_access ($cf::RUNTIME);
1673 $self->instantiate;
1277} 1674}
1278 1675
1279sub load_header { 1676sub load_header {
1280 my ($self) = @_; 1677 my ($self) = @_;
1281 1678
1282 if ($self->load_temp) { 1679 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1680 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1681 } else {
1289 $self->load_orig 1682 $self->load_header_orig
1290 or return; 1683 or return;
1291 1684 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1685 }
1686
1687 $self->{deny_reset} = 1
1688 if $self->no_reset;
1689
1690 $self->default_region (cf::region::find_by_path $self->{path})
1691 unless $self->default_region;
1297 1692
1298 1 1693 1
1299} 1694}
1300 1695
1301sub find; 1696sub find;
1314 $map->{last_save} = $cf::RUNTIME; 1709 $map->{last_save} = $cf::RUNTIME;
1315 1710
1316 $map->load_header 1711 $map->load_header
1317 or return; 1712 or return;
1318 1713
1319 if ($map->should_reset) { 1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1717 $map->reset;
1321 undef $guard; 1718 undef $guard;
1322 $map = find $path 1719 return find $path;
1323 or return;
1324 } 1720 }
1325 1721
1326 $cf::MAP{$path} = $map 1722 $cf::MAP{$path} = $map
1327 } 1723 }
1328} 1724}
1725
1726sub pre_load { }
1727sub post_load { }
1329 1728
1330sub load { 1729sub load {
1331 my ($self) = @_; 1730 my ($self) = @_;
1332 1731
1732 local $self->{deny_reset} = 1; # loading can take a long time
1733
1333 my $path = $self->{path}; 1734 my $path = $self->{path};
1735
1736 {
1334 my $guard = cf::lock_acquire "map_load:$path"; 1737 my $guard = cf::lock_acquire "map_load:$path";
1335 1738
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1739 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1740
1338 $self->in_memory (cf::MAP_LOADING); 1741 $self->in_memory (cf::MAP_LOADING);
1339 1742
1340 $self->alloc; 1743 $self->alloc;
1341 $self->_load_objects ($self->{load_path}, 1)
1342 or return;
1343 1744
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1745 $self->pre_load;
1345 if delete $self->{load_original};
1346
1347 if (my $uniq = $self->uniq_path) {
1348 utf8::encode $uniq;
1349 if (aio_open $uniq, O_RDONLY, 0) {
1350 $self->clear_unique_items;
1351 $self->_load_objects ($uniq, 0);
1352 }
1353 }
1354
1355 Coro::cede;
1356
1357 # now do the right thing for maps
1358 $self->link_multipart_objects;
1359
1360 unless ($self->{deny_activate}) {
1361 $self->decay_objects;
1362 $self->fix_auto_apply;
1363 $self->update_buttons;
1364 Coro::cede; 1746 Coro::cede;
1365 $self->set_darkness_map; 1747
1748 $self->_load_objects ($self->{load_path}, 1)
1749 or return;
1750
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original};
1753
1754 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) {
1757 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0);
1759 }
1760 }
1761
1762 Coro::cede;
1763 # now do the right thing for maps
1764 $self->link_multipart_objects;
1366 $self->difficulty ($self->estimate_difficulty) 1765 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1766 unless $self->difficulty;
1368 Coro::cede; 1767 Coro::cede;
1768
1769 unless ($self->{deny_activate}) {
1770 $self->decay_objects;
1771 $self->fix_auto_apply;
1772 $self->update_buttons;
1773 Coro::cede;
1774 $self->set_darkness_map;
1775 Coro::cede;
1369 $self->activate; 1776 $self->activate;
1370 } 1777 }
1371 1778
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1779 $self->in_memory (cf::MAP_IN_MEMORY);
1780 }
1781
1782 $self->post_load;
1373} 1783}
1374 1784
1375sub customise_for { 1785sub customise_for {
1376 my ($self, $ob) = @_; 1786 my ($self, $ob) = @_;
1377 1787
1378 return find "~" . $ob->name . "/" . $self->{path} 1788 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player; 1789 if $self->per_player;
1790
1791# return find "?party/" . $ob->name . "/" . $self->{path}
1792# if $self->per_party;
1380 1793
1381 $self 1794 $self
1382} 1795}
1383 1796
1384# find and load all maps in the 3x3 area around a map 1797# find and load all maps in the 3x3 area around a map
1416 1829
1417 cf::sync_job { $map->load }; 1830 cf::sync_job { $map->load };
1418} 1831}
1419 1832
1420our %MAP_PREFETCH; 1833our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1834our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1835
1434sub find_async { 1836sub find_async {
1435 my ($path, $origin) = @_; 1837 my ($path, $origin) = @_;
1436 1838
1437 $path = normalise $path, $origin && $origin->{path}; 1839 $path = normalise $path, $origin && $origin->{path};
1438 1840
1439 if (my $map = $cf::MAP{$path}) { 1841 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1843 }
1442 1844
1443 $MAP_PREFETCH{$path} = 0; 1845 undef $MAP_PREFETCH{$path};
1846 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) {
1849 my $map = find $path
1850 or next;
1851 $map->load;
1852
1853 delete $MAP_PREFETCH{$path};
1854 }
1855 }
1856 undef $MAP_PREFETCHER;
1857 };
1444 $MAP_PREFETCHER->ready; 1858 $MAP_PREFETCHER->prio (6);
1445 1859
1446 () 1860 ()
1447} 1861}
1448 1862
1449sub save { 1863sub save {
1494 1908
1495sub reset_at { 1909sub reset_at {
1496 my ($self) = @_; 1910 my ($self) = @_;
1497 1911
1498 # TODO: safety, remove and allow resettable per-player maps 1912 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player");
1500 return 1e99 if $self->{deny_reset}; 1913 return 1e99 if $self->{deny_reset};
1501 1914
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1915 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1916 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 1917
1509 my ($self) = @_; 1922 my ($self) = @_;
1510 1923
1511 $self->reset_at <= $cf::RUNTIME 1924 $self->reset_at <= $cf::RUNTIME
1512} 1925}
1513 1926
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 1927sub reset {
1529 my ($self) = @_; 1928 my ($self) = @_;
1530 1929
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1930 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 1931
1533 return if $self->players; 1932 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d#
1535 1933
1536 warn "resetting map ", $self->path;#d# 1934 warn "resetting map ", $self->path;
1935
1936 $self->in_memory (cf::MAP_SWAPPED);
1937
1938 # need to save uniques path
1939 unless ($self->{deny_save}) {
1940 my $uniq = $self->uniq_path; utf8::encode $uniq;
1941
1942 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1943 if $uniq;
1944 }
1537 1945
1538 delete $cf::MAP{$self->path}; 1946 delete $cf::MAP{$self->path};
1539 1947
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 1948 $self->clear;
1542 1949
1543 $_->clear_links_to ($self) for values %cf::MAP; 1950 $_->clear_links_to ($self) for values %cf::MAP;
1544 1951
1545 $self->unlink_save; 1952 $self->unlink_save;
1549my $nuke_counter = "aaaa"; 1956my $nuke_counter = "aaaa";
1550 1957
1551sub nuke { 1958sub nuke {
1552 my ($self) = @_; 1959 my ($self) = @_;
1553 1960
1961 delete $cf::MAP{$self->path};
1962
1963 $self->unlink_save;
1964
1965 bless $self, "cf::map";
1966 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 1967 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 1968 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970
1971 $cf::MAP{$self->path} = $self;
1972
1557 $self->reset; # polite request, might not happen 1973 $self->reset; # polite request, might not happen
1974}
1975
1976=item $maps = cf::map::tmp_maps
1977
1978Returns an arrayref with all map paths of currently instantiated and saved
1979maps. May block.
1980
1981=cut
1982
1983sub tmp_maps() {
1984 [
1985 map {
1986 utf8::decode $_;
1987 /\.map$/
1988 ? normalise $_
1989 : ()
1990 } @{ aio_readdir $TMPDIR or [] }
1991 ]
1992}
1993
1994=item $maps = cf::map::random_maps
1995
1996Returns an arrayref with all map paths of currently instantiated and saved
1997random maps. May block.
1998
1999=cut
2000
2001sub random_maps() {
2002 [
2003 map {
2004 utf8::decode $_;
2005 /\.map$/
2006 ? normalise "?random/$_"
2007 : ()
2008 } @{ aio_readdir $RANDOMDIR or [] }
2009 ]
1558} 2010}
1559 2011
1560=item cf::map::unique_maps 2012=item cf::map::unique_maps
1561 2013
1562Returns an arrayref of paths of all shared maps that have 2014Returns an arrayref of paths of all shared maps that have
1563instantiated unique items. May block. 2015instantiated unique items. May block.
1564 2016
1565=cut 2017=cut
1566 2018
1567sub unique_maps() { 2019sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2020 [
1569 or return; 2021 map {
1570
1571 my @paths;
1572
1573 for (@$files) {
1574 utf8::decode $_; 2022 utf8::decode $_;
1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//; 2023 /\.map$/
1579 push @paths, $_; 2024 ? normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] }
1580 } 2027 ]
1581
1582 \@paths
1583} 2028}
1584 2029
1585package cf; 2030package cf;
1586 2031
1587=back 2032=back
1633 2078
1634 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2079 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1635 2080
1636 if ($self->{record_replies}) { 2081 if ($self->{record_replies}) {
1637 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2082 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2083
1638 } else { 2084 } else {
2085 my $pl = $self->contr;
2086
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply (
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095
2096 } else {
1639 $msg = $npc->name . " says: $msg" if $npc; 2097 $msg = $npc->name . " says: $msg" if $npc;
1640 $self->message ($msg, $flags); 2098 $self->message ($msg, $flags);
2099 }
1641 } 2100 }
1642} 2101}
1643 2102
1644=item $player_object->may ("access") 2103=item $player_object->may ("access")
1645 2104
1678=cut 2137=cut
1679 2138
1680sub link_map { 2139sub link_map {
1681 unless ($LINK_MAP) { 2140 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 2141 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2142 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 2143 $LINK_MAP->load;
1685 } 2144 }
1686 2145
1687 $LINK_MAP 2146 $LINK_MAP
1688} 2147}
1693 $self->deactivate_recursive; 2152 $self->deactivate_recursive;
1694 2153
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2154 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 2155
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2156 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 2157 if $self->map && $self->map->{path} ne "{link}";
1699 2158
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2159 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 2160}
1702 2161
1703sub cf::object::player::leave_link { 2162sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 2163 my ($self, $map, $x, $y) = @_;
2164
2165 return unless $self->contr->active;
1705 2166
1706 my $link_pos = delete $self->{_link_pos}; 2167 my $link_pos = delete $self->{_link_pos};
1707 2168
1708 unless ($map) { 2169 unless ($map) {
1709 # restore original map position 2170 # restore original map position
1727 $map->load; 2188 $map->load;
1728 $map->load_diag; 2189 $map->load_diag;
1729 2190
1730 return unless $self->contr->active; 2191 return unless $self->contr->active;
1731 $self->activate_recursive; 2192 $self->activate_recursive;
2193
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 2195 $self->enter_map ($map, $x, $y);
1733} 2196}
1734 2197
1735cf::player->attach (
1736 on_logout => sub {
1737 my ($pl) = @_;
1738
1739 # abort map switching before logout
1740 if ($pl->ob->{_link_pos}) {
1741 cf::sync_job {
1742 $pl->ob->leave_link
1743 };
1744 }
1745 },
1746 on_login => sub {
1747 my ($pl) = @_;
1748
1749 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link;
1753 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED);
1760 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link;
1762 })->prio (2);
1763 }
1764 },
1765);
1766
1767=item $player_object->goto ($path, $x, $y) 2198=item $player_object->goto ($path, $x, $y[, $check->($map)])
1768 2199
2200Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position.
2204
1769=cut 2205=cut
2206
2207our $GOTOGEN;
1770 2208
1771sub cf::object::player::goto { 2209sub cf::object::player::goto {
1772 my ($self, $path, $x, $y) = @_; 2210 my ($self, $path, $x, $y, $check) = @_;
2211
2212 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1773 2214
1774 $self->enter_link; 2215 $self->enter_link;
1775 2216
1776 (async { 2217 (async {
2218 my $map = eval {
1777 my $map = cf::map::find $path; 2219 my $map = cf::map::find $path;
2220
2221 if ($map) {
1778 $map = $map->customise_for ($self) if $map; 2222 $map = $map->customise_for ($self);
1779 2223 $map = $check->($map) if $check && $map;
1780# warn "entering ", $map->path, " at ($x, $y)\n" 2224 } else {
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2226 }
1784 2227
2228 $map
2229 };
2230
2231 if ($@) {
2232 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2233 LOG llevError | logBacktrace, Carp::longmess $@;
2234 }
2235
2236 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation};
1785 $self->leave_link ($map, $x, $y); 2238 $self->leave_link ($map, $x, $y);
2239 }
1786 })->prio (1); 2240 })->prio (1);
1787} 2241}
1788 2242
1789=item $player_object->enter_exit ($exit_object) 2243=item $player_object->enter_exit ($exit_object)
1790 2244
1792 2246
1793sub parse_random_map_params { 2247sub parse_random_map_params {
1794 my ($spec) = @_; 2248 my ($spec) = @_;
1795 2249
1796 my $rmp = { # defaults 2250 my $rmp = { # defaults
1797 xsize => 10, 2251 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 2252 ysize => (cf::rndm 15, 40),
2253 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2254 #layout => string,
1799 }; 2255 };
1800 2256
1801 for (split /\n/, $spec) { 2257 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 2258 my ($k, $v) = split /\s+/, $_, 2;
1803 2259
1807 $rmp 2263 $rmp
1808} 2264}
1809 2265
1810sub prepare_random_map { 2266sub prepare_random_map {
1811 my ($exit) = @_; 2267 my ($exit) = @_;
2268
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 2270
1813 # all this does is basically replace the /! path by 2271 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 2272 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 2273 # that depends on the exit object
1816 2274
1817 my $rmp = parse_random_map_params $exit->msg; 2275 my $rmp = parse_random_map_params $exit->msg;
1818 2276
1819 if ($exit->map) { 2277 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 2278 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 2279 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2280 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2281 $rmp->{origin_y} = $exit->y;
1824 } 2282 }
1825 2283
1826 $rmp->{random_seed} ||= $exit->random_seed; 2284 $rmp->{random_seed} ||= $exit->random_seed;
1827 2285
1828 my $data = cf::to_json $rmp; 2286 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2287 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta";
1830 2289
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2291 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh;
2293 aio_rename "$meta~", $meta;
1833 2294
1834 $exit->slaying ("?random/$md5"); 2295 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2296 $exit->msg (undef);
1836 } 2297 }
1837} 2298}
1838 2299
1839sub cf::object::player::enter_exit { 2300sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2301 my ($self, $exit) = @_;
1841 2302
1842 return unless $self->type == cf::PLAYER; 2303 return unless $self->type == cf::PLAYER;
2304
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
1843 2315
1844 $self->enter_link; 2316 $self->enter_link;
1845 2317
1846 (async { 2318 (async {
1847 $self->deactivate_recursive; # just to be sure 2319 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2320 unless (eval {
1849 prepare_random_map $exit 2321 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 2322
1855 1; 2323 1;
1856 }) { 2324 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2325 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2326 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2327 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2328 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2329
1862 warn "ERROR in enter_exit: $@"; 2330 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2331 $self->leave_link;
1864 } 2332 }
1865 })->prio (1); 2333 })->prio (1);
1878 2346
1879sub cf::client::send_drawinfo { 2347sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2348 my ($self, $text, $flags) = @_;
1881 2349
1882 utf8::encode $text; 2350 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2352}
1885 2353
2354=item $client->send_msg ($color, $type, $msg, [extra...])
2355
2356Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet.
2360
2361=cut
2362
2363sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_;
2365
2366 $msg = $self->pl->expand_cfpod ($msg);
2367
2368 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg")
2387 }
2388 }
2389 }
2390}
2391
2392=item $client->ext_event ($type, %msg)
2393
2394Sends an exti event to the client.
2395
2396=cut
2397
2398sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_;
2400
2401 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg);
2403}
1886 2404
1887=item $success = $client->query ($flags, "text", \&cb) 2405=item $success = $client->query ($flags, "text", \&cb)
1888 2406
1889Queues a query to the client, calling the given callback with 2407Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1919 # get handled first 2437 # get handled first
1920 my $queue = delete $ns->{query_queue} 2438 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2439 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2440
1923 (shift @$queue)->[1]->($msg); 2441 (shift @$queue)->[1]->($msg);
2442 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2443
1925 push @{ $ns->{query_queue} }, @$queue; 2444 push @{ $ns->{query_queue} }, @$queue;
1926 2445
1927 if (@{ $ns->{query_queue} } == @$queue) { 2446 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2447 if (@$queue) {
1986 2505
1987# here we export the classes and methods available to script code 2506# here we export the classes and methods available to script code
1988 2507
1989=pod 2508=pod
1990 2509
1991The following fucntions and emthods are available within a safe environment: 2510The following functions and methods are available within a safe environment:
1992 2511
1993 cf::object contr pay_amount pay_player map 2512 cf::object contr pay_amount pay_player map
1994 cf::object::player player 2513 cf::object::player player
1995 cf::player peaceful 2514 cf::player peaceful
1996 cf::map trigger 2515 cf::map trigger
2077=back 2596=back
2078 2597
2079=cut 2598=cut
2080 2599
2081############################################################################# 2600#############################################################################
2601# the server's init and main functions
2082 2602
2083=head2 EXTENSION DATABASE SUPPORT 2603sub load_facedata($) {
2604 my ($path) = @_;
2084 2605
2085Crossfire maintains a very simple database for extension use. It can 2606 warn "loading facedata from $path\n";
2086currently store anything that can be serialised using Storable, which
2087excludes objects.
2088 2607
2089The parameter C<$family> should best start with the name of the extension 2608 my $facedata;
2090using it, it should be unique. 2609 0 < aio_load $path, $facedata
2610 or die "$path: $!";
2091 2611
2092=over 4 2612 $facedata = Coro::Storable::thaw $facedata;
2093 2613
2094=item $hashref = cf::db_get $family 2614 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed.";
2095 2616
2096Return a hashref for use by the extension C<$family>, which can be
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099
2100=item $value = cf::db_get $family => $key
2101
2102Returns a single value from the database
2103
2104=item cf::db_put $family => $hashref
2105
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108
2109=item cf::db_put $family => $key => $value
2110
2111Stores the given C<$value> in the family hash. Updates are delayed, if you
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121
2122=cut
2123
2124our $DB;
2125
2126{
2127 my $path = cf::localdir . "/database.pst";
2128
2129 sub db_load() {
2130 $DB = stat $path ? Storable::retrieve $path : { };
2131 } 2617 {
2618 my $faces = $facedata->{faceinfo};
2132 2619
2133 my $pid; 2620 while (my ($face, $info) = each %$faces) {
2134 2621 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2135 sub db_save() { 2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2136 waitpid $pid, 0 if $pid; 2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2137 if (0 == ($pid = fork)) { 2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2138 $DB->{_meta}{version} = 1; 2625 Coro::cede;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 }
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 });
2155
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) {
2162 @_ >= 2
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166
2167 sub db_put($$;$) {
2168 if (@_ >= 3) {
2169 $DB->{$_[0]}{$_[1]} = $_[2];
2170 } else {
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175
2176 cf::global->attach (
2177 prio => 10000,
2178 on_cleanup => sub {
2179 db_sync;
2180 }, 2626 }
2181 );
2182}
2183 2627
2184############################################################################# 2628 while (my ($face, $info) = each %$faces) {
2185# the server's main() 2629 next unless $info->{smooth};
2630 my $idx = cf::face::find $face
2631 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) {
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2634 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 }
2637 Coro::cede;
2638 }
2639 }
2640
2641 {
2642 my $anims = $facedata->{animinfo};
2643
2644 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede;
2647 }
2648
2649 cf::anim::invalidate_all; # d'oh
2650 }
2651
2652 1
2653}
2654
2655sub reload_regions {
2656 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n";
2658}
2659
2660sub reload_facedata {
2661 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n";
2663}
2664
2665sub reload_archetypes {
2666 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n";
2668}
2669
2670sub reload_treasures {
2671 load_resource_file "$DATADIR/treasures"
2672 or die "unable to load treasurelists\n";
2673}
2674
2675sub reload_resources {
2676 warn "reloading resource files...\n";
2677
2678 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures;
2683
2684 warn "finished reloading resource files\n";
2685}
2686
2687sub init {
2688 reload_resources;
2689}
2186 2690
2187sub cfg_load { 2691sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2692 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 2693 or return;
2190 2694
2191 local $/; 2695 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 2696 *CFG = YAML::Syck::Load <$fh>;
2193 2697
2207 2711
2208sub main { 2712sub main {
2209 # we must not ever block the main coroutine 2713 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2714 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async {
2212 async { Event::one_event }; 2717 Event::one_event;
2718 })->prio (Coro::PRIO_MAX);
2213 }; 2719 };
2214 2720
2215 cfg_load; 2721 cfg_load;
2216 db_load; 2722 db_init;
2217 load_extensions; 2723 load_extensions;
2724
2725 $TICK_WATCHER->start;
2218 Event::loop; 2726 Event::loop;
2219} 2727}
2220 2728
2221############################################################################# 2729#############################################################################
2222# initialisation and cleanup 2730# initialisation and cleanup
2223 2731
2224# install some emergency cleanup handlers 2732# install some emergency cleanup handlers
2225BEGIN { 2733BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 2734 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 2735 Event->signal (
2736 reentrant => 0,
2228 data => WF_AUTOCANCEL, 2737 data => WF_AUTOCANCEL,
2229 signal => $signal, 2738 signal => $signal,
2739 prio => 0,
2230 cb => sub { 2740 cb => sub {
2231 cf::cleanup "SIG$signal"; 2741 cf::cleanup "SIG$signal";
2232 }, 2742 },
2233 ); 2743 );
2234 } 2744 }
2745}
2746
2747sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time.
2752
2753 IO::AIO::aio_utime $runtime, undef, undef;
2754
2755 my $guard = cf::lock_acquire "write_runtime";
2756
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2758 or return;
2759
2760 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server.
2763
2764 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2765 and return;
2766
2767 # always fsync - this file is important
2768 aio_fsync $fh
2769 and return;
2770
2771 # touch it again to show we are up-to-date
2772 aio_utime $fh, undef, undef;
2773
2774 close $fh
2775 or return;
2776
2777 aio_rename "$runtime~", $runtime
2778 and return;
2779
2780 warn "runtime file written.\n";
2781
2782 1
2235} 2783}
2236 2784
2237sub emergency_save() { 2785sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop; 2786 my $freeze_guard = cf::freeze_mainloop;
2239 2787
2256 my $map = $cf::MAP{$path} or next; 2804 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 2805 $map->valid or next;
2258 $map->save; 2806 $map->save;
2259 } 2807 }
2260 warn "end emergency map save\n"; 2808 warn "end emergency map save\n";
2809
2810 warn "begin emergency database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n";
2261 }; 2813 };
2262 2814
2263 warn "leave emergency perl save\n"; 2815 warn "leave emergency perl save\n";
2264} 2816}
2265 2817
2818sub post_cleanup {
2819 my ($make_core) = @_;
2820
2821 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core;
2823}
2824
2266sub reload() { 2825sub do_reload_perl() {
2267 # can/must only be called in main 2826 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 2827 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 2828 warn "can only reload from main coroutine";
2270 return; 2829 return;
2271 } 2830 }
2272 2831
2273 warn "reloading..."; 2832 warn "reloading...";
2274 2833
2275 warn "freezing server"; 2834 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 2835
2836 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 2838 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark
2278 2840
2279 warn "sync database to disk"; 2841 warn "syncing database to disk";
2280 cf::db_sync; 2842 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 2843
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 2844 # if anything goes wrong in here, we should simply crash as we already saved
2285 2845
2286 warn "cancel all watchers"; 2846 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 2847 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 2849 }
2290 2850
2851 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate...";
2858 }
2859
2860 ++$RELOAD;
2861
2291 warn "cancel all extension coros"; 2862 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 2863 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 2864 %EXT_CORO = ();
2294 2865
2295 warn "remove commands"; 2866 warn "removing commands";
2296 %COMMAND = (); 2867 %COMMAND = ();
2297 2868
2298 warn "remove ext commands"; 2869 warn "removing ext commands";
2299 %EXTCMD = (); 2870 %EXTCMD = ();
2300 2871
2301 warn "unload/nuke all extensions"; 2872 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 2873 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 2874 warn "... unloading $pkg";
2304 2875
2305 if (my $cb = $pkg->can ("unload")) { 2876 if (my $cb = $pkg->can ("unload")) {
2306 eval { 2877 eval {
2311 2882
2312 warn "... nuking $pkg"; 2883 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 2884 Symbol::delete_package $pkg;
2314 } 2885 }
2315 2886
2316 warn "unload all perl modules loaded from $LIBDIR"; 2887 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 2888 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 2890
2320 warn "removing <$k>"; 2891 warn "... unloading $k";
2321 delete $INC{$k}; 2892 delete $INC{$k};
2322 2893
2323 $k =~ s/\.pm$//; 2894 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 2895 $k =~ s/\//::/g;
2325 2896
2328 } 2899 }
2329 2900
2330 Symbol::delete_package $k; 2901 Symbol::delete_package $k;
2331 } 2902 }
2332 2903
2333 warn "get rid of safe::, as good as possible"; 2904 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 2905 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 2907
2337 warn "unload cf.pm \"a bit\""; 2908 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 2909 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"};
2339 2911
2340 # don't, removes xs symbols, too, 2912 # don't, removes xs symbols, too,
2341 # and global variables created in xs 2913 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 2914 #Symbol::delete_package __PACKAGE__;
2343 2915
2916 warn "unload completed, starting to reload now";
2917
2344 warn "reloading cf.pm"; 2918 warn "reloading cf.pm";
2345 require cf; 2919 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 2921
2348 warn "load config and database again"; 2922 warn "loading config and database again";
2349 cf::cfg_load; 2923 cf::cfg_load;
2350 cf::db_load;
2351 2924
2352 warn "load extensions"; 2925 warn "loading extensions";
2353 cf::load_extensions; 2926 cf::load_extensions;
2354 2927
2355 warn "reattach attachments to objects/players"; 2928 warn "reattaching attachments to objects/players";
2356 _global_reattach; 2929 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 2930 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 2931 reattach $_ for values %MAP;
2359 }; 2932 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER;
2360 2934
2361 if ($@) { 2935 warn "leaving sync_job";
2936
2937 1
2938 } or do {
2362 warn $@; 2939 warn $@;
2363 warn "error while reloading, exiting."; 2940 warn "error while reloading, exiting.";
2364 exit 1; 2941 exit 1;
2365 } 2942 };
2366 2943
2367 warn "reloaded"; 2944 warn "reloaded";
2368}; 2945};
2369 2946
2947our $RELOAD_WATCHER; # used only during reload
2948
2949sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here.
2952
2953 $RELOAD_WATCHER ||= Event->timer (
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl;
2959 undef $RELOAD_WATCHER;
2960 },
2961 );
2962}
2963
2370register_command "reload" => sub { 2964register_command "reload" => sub {
2371 my ($who, $arg) = @_; 2965 my ($who, $arg) = @_;
2372 2966
2373 if ($who->flag (FLAG_WIZ)) { 2967 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 2968 $who->message ("reloading server.");
2969 async { reload_perl };
2377 } 2970 }
2378}; 2971};
2379 2972
2380unshift @INC, $LIBDIR; 2973unshift @INC, $LIBDIR;
2381 2974
2975my $bug_warning = 0;
2976
2977our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN;
2979
2980sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main;
2983
2984 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait;
2987}
2988
2989sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main;
2992
2993 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait;
2996}
2997
2998 my $min = 1e6;#d#
2999 my $avg = 10;
2382$TICK_WATCHER = Event->timer ( 3000$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 3001 reentrant => 0,
3002 parked => 1,
2384 prio => 0, 3003 prio => 0,
2385 at => $NEXT_TICK || $TICK, 3004 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 3005 data => WF_AUTOCANCEL,
2387 cb => sub { 3006 cb => sub {
3007 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10;
3010 return;
3011 }
3012
2388 $NOW = Event::time; 3013 $NOW = $tick_start = Event::time;
2389 3014
2390 cf::server_tick; # one server iteration 3015 cf::server_tick; # one server iteration
3016
3017 0 && sync_job {#d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 };
3039
2391 $RUNTIME += $TICK; 3040 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 3041 $NEXT_TICK += $TICK;
2393 3042
2394 $WAIT_FOR_TICK->broadcast; 3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send;
3056 }
3057 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send;
3059 }
3060
3061 $NOW = Event::time;
2396 3062
2397 # if we are delayed by four ticks or more, skip them all 3063 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2399 3065
2400 $TICK_WATCHER->at ($NEXT_TICK); 3066 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071
3072 _post_tick;
3073
3074
2402 }, 3075 },
2403); 3076);
2404 3077
3078{
2405IO::AIO::max_poll_time $TICK * 0.2; 3079 BDB::max_poll_time $TICK * 0.1;
2406 3080 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 3081 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 3082 fd => BDB::poll_fileno,
2409 poll => 'r', 3083 poll => 'r',
2410 prio => 5, 3084 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 3085 data => WF_AUTOCANCEL,
2417 after => 0, 3086 cb => \&BDB::poll_cb,
2418 interval => 10, 3087 );
2419 cb => sub { 3088 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 3089
2421 write_runtime 3090 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104
3105 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create;
3107
3108 cf::sync_job {
3109 eval {
3110 BDB::db_env_open
3111 $DB_ENV,
3112 $BDBDIR,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666;
3116
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 };
3122
3123 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 3124 };
2424 }, 3125 }
2425); 3126}
3127
3128{
3129 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io (
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141}
3142
3143my $_log_backtrace;
3144
3145sub _log_backtrace {
3146 my ($msg, @addr) = @_;
3147
3148 $msg =~ s/\n//;
3149
3150 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace;
3153 async {
3154 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!";
3159
3160 my @funcs;
3161 my @res = <$fh>;
3162 chomp for @res;
3163 while (@res) {
3164 my ($func, $line) = splice @res, 0, 2, ();
3165 push @funcs, "[$func] $line";
3166 }
3167
3168 @funcs
3169 };
3170
3171 LOG llevInfo, "[ABT] $msg\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace;
3174 };
3175 } else {
3176 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n";
3178 }
3179}
3180
3181# load additional modules
3182use cf::pod;
2426 3183
2427END { cf::emergency_save } 3184END { cf::emergency_save }
2428 3185
24291 31861
2430 3187

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines