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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines