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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 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.64 ();
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;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 80our $NEXT_TICK;
50our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
51 86
52our %CFG; 87our %CFG;
53 88
54our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 90our $RUNTIME;
56 91
57our %PLAYER; # all users 92our %PLAYER; # all users
58our %MAP; # all maps 93our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 94our $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 95
65# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
68binmode STDOUT; 103binmode STDOUT;
69binmode STDERR; 104binmode STDERR;
70 105
71# read virtual server time, if available 106# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
76} 111}
77 112
78mkdir cf::localdir; 113mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 115
84our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
85 119
86############################################################################# 120#############################################################################
87 121
88=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
89 123
… …
96=item $cf::RUNTIME 130=item $cf::RUNTIME
97 131
98The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 133every server tick.
100 134
101=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 138
103The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
105 143
106=item $cf::NOW 144=item $cf::NOW
107 145
108The time of the last (current) server tick. 146The time of the last (current) server tick.
109 147
110=item $cf::TICK 148=item $cf::TICK
111 149
112The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
113 161
114=item %cf::CFG 162=item %cf::CFG
115 163
116Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 165from wherever your confdir points to.
118 166
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
120 168
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These 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 170returns 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 171per 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. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
125 178
126=back 179=back
127 180
128=cut 181=cut
129 182
130BEGIN { 183BEGIN {
131 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 185 my $msg = join "", @_;
133 utf8::encode $msg;
134 186
135 $msg .= "\n" 187 $msg .= "\n"
136 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
137 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
138 LOG llevError, $msg; 193 LOG llevError, $msg;
139 }; 194 };
140} 195}
141 196
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
144@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
145@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
146@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
147@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
148 204
149# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
150# within the Safe compartment. 206# within the Safe compartment.
151for my $pkg (qw( 207for my $pkg (qw(
152 cf::global cf::attachable 208 cf::global cf::attachable
… …
160} 216}
161 217
162$Event::DIED = sub { 218$Event::DIED = sub {
163 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
164}; 220};
221
222#############################################################################
165 223
166=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
167 225
168=over 4 226=over 4
169 227
… …
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 247 $d
190 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
191} 249}
192 250
193use JSON::Syck (); # TODO# replace by JSON::PC once working
194
195=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
196 252
197Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
198 254
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 255=item $json = cf::to_json $ref
207 256
208Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
209 258
210=cut 259=cut
211 260
212sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
214 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
215} 264sub from_json ($) { $json_coder->decode ($_[0]) }
216 265
217=item cf::lock_wait $string 266=item cf::lock_wait $string
218 267
219Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
220 269
… …
223Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
226returned. 275returned.
227 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
228Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
230 286
231=cut 287=cut
232 288
233our %LOCK; 289our %LOCK;
234 290
… …
254 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
256 } 312 }
257} 313}
258 314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
319}
320
259sub freeze_mainloop { 321sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
261 323
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 324 my $guard = Coro::guard {
325 $TICK_WATCHER->start;
326 };
263 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
264 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
265} 385}
266 386
267=item cf::async { BLOCK } 387=item cf::async { BLOCK }
268 388
269Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
274 394
275BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
276 396
277=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
278 398
279The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
280always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
282 403
283If it must be done, put the blocking parts into C<sync_job>. This will run 404If 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 405the given BLOCK in another coroutine while waiting for the result. The
285server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
286fast or be very important. 407fast or be very important.
… …
289 410
290sub sync_job(&) { 411sub sync_job(&) {
291 my ($job) = @_; 412 my ($job) = @_;
292 413
293 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
294 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
296 419
297 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
298 # (but this is cancel-safe) 421 # (but this is cancel-safe)
… …
309 432
310 while ($busy) { 433 while ($busy) {
311 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
312 } 435 }
313 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
314 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
315 } else { 445 } else {
316 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
317 447
318 $job->() 448 $job->()
… …
337 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
338 468
339 $coro 469 $coro
340} 470}
341 471
342sub write_runtime { 472=item fork_call { }, $args
343 return unless $TICK_WATCHER->is_active;
344 473
345 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
346 478
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
348 or return;
349 480
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 481sub fork_call(&@) {
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 482 my ($cb, @args) = @_;
352 and return;
353 483
354 aio_fsync $fh 484 # we seemingly have to make a local copy of the whole thing,
355 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
356 487
357 close $fh 488 my @res = Coro::Util::fork_eval {
358 or return; 489 reset_signals;
490 &$cb
491 }, @args;
359 492
360 aio_rename "$runtime~", $runtime 493 wantarray ? @res : $res[-1]
361 and return; 494}
362 495
496=item $value = cf::db_get $family => $key
497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
363 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 621}
365 622
366=back 623=back
367 624
368=cut 625=cut
… …
375attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
376to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
377 634
378In the following description, CLASS can be any of C<global>, C<object> 635In 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 636C<player>, C<client> or C<map> (i.e. the attachable objects in
380crossfire+). 637Crossfire TRT).
381 638
382=over 4 639=over 4
383 640
384=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
385 642
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 756our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 757our @CB_MAP = ();
501 758
502my %attachment; 759my %attachment;
503 760
761sub cf::attachable::thawer_merge {
762 # simply override everything except _meta
763 local $_[0]{_meta};
764 %{$_[0]} = %{$_[1]};
765}
766
504sub _attach_cb($$$$) { 767sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 768 my ($registry, $event, $prio, $cb) = @_;
506 769
507 use sort 'stable'; 770 use sort 'stable';
508 771
… …
542 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
543 806
544 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
545 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
546 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
547 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
548 811
549 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
550 my $pkg = shift @arg; 813 my $pkg = shift @arg;
551 814
552 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
… …
581 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
582 } 845 }
583 846
584 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
585 } else { 848 } else {
586 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
587 } 850 }
588 851
589 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
590} 853}
591 854
… …
593 if (ref $_[0]) { 856 if (ref $_[0]) {
594 _object_attach @_; 857 _object_attach @_;
595 } else { 858 } else {
596 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
597 } 860 }
861 _recalc_want;
598}; 862};
599 863
600# all those should be optimised 864# all those should be optimised
601sub cf::attachable::detach { 865sub cf::attachable::detach {
602 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
… …
605 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
606 reattach ($obj); 870 reattach ($obj);
607 } else { 871 } else {
608 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
609 } 873 }
874 _recalc_want;
610}; 875};
611 876
612sub cf::attachable::attached { 877sub cf::attachable::attached {
613 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
614 879
… …
629 "; 894 ";
630 die if $@; 895 die if $@;
631} 896}
632 897
633our $override; 898our $override;
634our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
635 900
636sub override { 901sub override {
637 $override = 1; 902 $override = 1;
638 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
639} 904}
640 905
641sub do_invoke { 906sub do_invoke {
642 my $event = shift; 907 my $event = shift;
643 my $callbacks = shift; 908 my $callbacks = shift;
644 909
645 @invoke_results = (); 910 @INVOKE_RESULTS = ();
646 911
647 local $override; 912 local $override;
648 913
649 for (@$callbacks) { 914 for (@$callbacks) {
650 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
667 932
668Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
669 934
670This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
671removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
672results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
673 938
674=back 939=back
675 940
676=cut 941=cut
677 942
678############################################################################# 943#############################################################################
679# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
680 956
681sub reattach { 957sub reattach {
682 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 959 my ($obj) = @_;
960
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 962
685 my $registry = $obj->registry; 963 my $registry = $obj->registry;
686 964
687 @$registry = (); 965 @$registry = ();
688 966
… …
735 $filename, length $$rdata, scalar @$objs; 1013 $filename, length $$rdata, scalar @$objs;
736 1014
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 1016 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 1018 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 1019 close $fh;
742 1020
743 if (@$objs) { 1021 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 1023 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1024 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 1025 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 1026 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 1027 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 1028 aio_rename "$filename.pst~", "$filename.pst";
751 } 1029 }
752 } else { 1030 } else {
753 aio_unlink "$filename.pst"; 1031 aio_unlink "$filename.pst";
… …
785 or return; 1063 or return;
786 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
787 } 1065 }
788 1066
789 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
791 return ($data, $av); 1069 return ($data, $av);
792} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
793 1077
794############################################################################# 1078#############################################################################
795# command handling &c 1079# command handling &c
796 1080
797=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
… …
810 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
811} 1095}
812 1096
813=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
814 1098
815Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
816 1104
817If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
818called. 1106called.
819 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
820=cut 1119=cut
821 1120
822sub register_extcmd { 1121sub register_extcmd {
823 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
824 1123
825 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
826} 1131}
827 1132
828cf::player->attach ( 1133cf::player->attach (
829 on_command => sub { 1134 on_command => sub {
830 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
… …
839 cf::override; 1144 cf::override;
840 }, 1145 },
841 on_extcmd => sub { 1146 on_extcmd => sub {
842 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
843 1148
844 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
845 1150
846 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
847 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
848 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
849 $pl->ext_reply ($msg->{msgid}, %reply);
850 }
851 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
852 } else { 1166 } else {
853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
854 } 1168 }
855 1169
856 cf::override; 1170 cf::override;
857 }, 1171 },
858); 1172);
859 1173
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 { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
895 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
896 next unless -r $ext; 1179 next unless -r $path;
897 eval { 1180
898 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
899 1 1238 }
900 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
901 } 1244 };
902} 1245}
903 1246
904############################################################################# 1247#############################################################################
905 1248
1249=back
1250
906=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
907 1252
908Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
909 1254
910=cut 1255=cut
… …
922Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
923 1268
924=cut 1269=cut
925 1270
926sub playerdir($) { 1271sub playerdir($) {
927 cf::localdir 1272 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 1274}
933 1275
934sub path($) { 1276sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 1278
937 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
938} 1280}
939 1281
940sub find_active($) { 1282sub find_active($) {
941 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
… …
945 1287
946sub exists($) { 1288sub exists($) {
947 my ($login) = @_; 1289 my ($login) = @_;
948 1290
949 $cf::PLAYER{$login} 1291 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 1292 or cf::sync_job { !aio_stat path $login }
951} 1293}
952 1294
953sub find($) { 1295sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1296 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1297 my $login = $_[0];
956 1298
957 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
958 1300
959 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
960 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
961 or return; 1310 or return;
962 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
963 } 1312 }
964 } 1313 }
… …
976 1325
977 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
978 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
979 1328
980 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
981 Coro::cede; 1330 cf::cede_to_tick;
982} 1331}
983 1332
984sub new($) { 1333sub new($) {
985 my ($login) = @_; 1334 my ($login) = @_;
986 1335
… …
992 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
993 1342
994 $self 1343 $self
995} 1344}
996 1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1354}
1355
997=item $pl->quit_character 1356=item $pl->quit_character
998 1357
999Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1000be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1001 1360
1002=cut 1361=cut
1003 1362
1004sub quit_character { 1363sub quit_character {
1005 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1006 1367
1007 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1369 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1370
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1015 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1380 $pl->destroy;
1381
1382 my $prefix = qr<^~\Q$name\E/>;
1383
1384 # nuke player maps
1385 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1386
1020 IO::AIO::aio_rmtree $temp; 1387 IO::AIO::aio_rmtree $temp;
1388}
1389
1390=item $pl->kick
1391
1392Kicks a player out of the game. This destroys the connection.
1393
1394=cut
1395
1396sub kick {
1397 my ($pl, $kicker) = @_;
1398
1399 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1400 $pl->killer ("kicked");
1401 $pl->ns->destroy;
1021} 1402}
1022 1403
1023=item cf::player::list_logins 1404=item cf::player::list_logins
1024 1405
1025Returns am arrayref of all valid playernames in the system, can take a 1406Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1027 1408
1028=cut 1409=cut
1029 1410
1030sub list_logins { 1411sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1413 or return [];
1033 1414
1034 my @logins; 1415 my @logins;
1035 1416
1036 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
… …
1053=cut 1434=cut
1054 1435
1055sub maps($) { 1436sub maps($) {
1056 my ($pl) = @_; 1437 my ($pl) = @_;
1057 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1058 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1059 or return; 1442 or return;
1060 1443
1061 my @paths; 1444 my @paths;
1062 1445
1063 for (@$files) { 1446 for (@$files) {
1064 utf8::decode $_; 1447 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1067 1450
1068 s/\.map$//; 1451 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1452 }
1071 1453
1072 \@paths 1454 \@paths
1073} 1455}
1074 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1
1480 }ge
1481 # replace H<hint text>
1482 || s{H<([^\>]*)>}
1483 {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "")
1487 [$self->{hintmode}]
1488 }ge;
1489
1490 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g;
1492
1493 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1498
1499 $_
1500}
1501
1502sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode}
1505}
1506
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1076 1508
1077Sends an ext reply to the player. 1509Sends an ext reply to the player.
1078 1510
1079=cut 1511=cut
1080 1512
1081sub ext_reply($$$%) { 1513sub ext_reply($$@) {
1082 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1083 1515
1084 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1085
1086 $self->send ("ext " . cf::to_json \%msg);
1087} 1517}
1088 1518
1089package cf; 1519=item $player->ext_msg ($type, @msg)
1520
1521Sends an ext event to the client.
1522
1523=cut
1524
1525sub ext_msg($$@) {
1526 my ($self, $type, @msg) = @_;
1527
1528 $self->ns->ext_msg ($type, @msg);
1529}
1530
1531=head3 cf::region
1532
1533=over 4
1534
1535=cut
1536
1537package cf::region;
1538
1539=item cf::region::find_by_path $path
1540
1541Tries to decuce the likely region for a map knowing only its path.
1542
1543=cut
1544
1545sub find_by_path($) {
1546 my ($path) = @_;
1547
1548 my ($match, $specificity);
1549
1550 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) {
1552 ($match, $specificity) = ($region, $region->specificity)
1553 if $region->specificity > $specificity;
1554 }
1555 }
1556
1557 $match
1558}
1090 1559
1091=back 1560=back
1092
1093 1561
1094=head3 cf::map 1562=head3 cf::map
1095 1563
1096=over 4 1564=over 4
1097 1565
… …
1101 1569
1102use Fcntl; 1570use Fcntl;
1103use Coro::AIO; 1571use Coro::AIO;
1104 1572
1105use overload 1573use overload
1106 '""' => \&as_string; 1574 '""' => \&as_string,
1575 fallback => 1;
1107 1576
1108our $MAX_RESET = 3600; 1577our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1578our $DEFAULT_RESET = 3000;
1110 1579
1111sub generate_random_map { 1580sub generate_random_map {
1112 my ($self, $rmp) = @_; 1581 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1582 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1583 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1595 )
1128} 1596}
1129 1597
1598=item cf::map->register ($regex, $prio)
1599
1600Register a handler for the map path matching the given regex at the
1601givne priority (higher is better, built-in handlers have priority 0, the
1602default).
1603
1604=cut
1605
1130sub register { 1606sub register {
1131 my (undef, $regex) = @_; 1607 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1608 my $pkg = caller;
1133 1609
1134 no strict; 1610 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1611 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1612
1137 $EXT_MAP{$pkg} = qr<$regex>; 1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1614}
1139 1615
1140# also paths starting with '/' 1616# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1618
1619sub thawer_merge {
1620 my ($self, $merge) = @_;
1621
1622 # we have to keep some variables in memory intact
1623 local $self->{path};
1624 local $self->{load_path};
1625
1626 $self->SUPER::thawer_merge ($merge);
1627}
1142 1628
1143sub normalise { 1629sub normalise {
1144 my ($path, $base) = @_; 1630 my ($path, $base) = @_;
1631
1632 $path = "$path"; # make sure its a string
1633
1634 $path =~ s/\.map$//;
1145 1635
1146 # map plan: 1636 # map plan:
1147 # 1637 #
1148 # /! non-realised random map exit (special hack!) 1638 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1639 # {... are special paths that are not being touched
… …
1177 1667
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1668 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1669
1180 $path = normalise $path, $base; 1670 $path = normalise $path, $base;
1181 1671
1182 for my $pkg (keys %EXT_MAP) { 1672 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1673 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1674 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1675 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1187 return $self; 1677 return $self;
1188 } 1678 }
1189 } 1679 }
1190 1680
1191 Carp::carp "unable to resolve path '$path'."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1192 () 1682 ()
1193} 1683}
1194 1684
1195sub init { 1685sub init {
1196 my ($self) = @_; 1686 my ($self) = @_;
… …
1211 1701
1212# the original (read-only) location 1702# the original (read-only) location
1213sub load_path { 1703sub load_path {
1214 my ($self) = @_; 1704 my ($self) = @_;
1215 1705
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1217} 1707}
1218 1708
1219# the temporary/swap location 1709# the temporary/swap location
1220sub save_path { 1710sub save_path {
1221 my ($self) = @_; 1711 my ($self) = @_;
1222 1712
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1225} 1715}
1226 1716
1227# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1228sub uniq_path { 1718sub uniq_path {
1229 my ($self) = @_; 1719 my ($self) = @_;
1230 1720
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1233} 1723}
1234 1724
1235# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1236# all maps in C++... 1726# all maps in C++...
1237sub change_all_map_light { 1727sub change_all_map_light {
… …
1239 1729
1240 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1241 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1242} 1732}
1243 1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1740}
1741
1244sub unlink_save { 1742sub unlink_save {
1245 my ($self) = @_; 1743 my ($self) = @_;
1246 1744
1247 utf8::encode (my $save = $self->save_path); 1745 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1746 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1747 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1748}
1251 1749
1252sub load_header_from($) { 1750sub load_header_from($) {
1253 my ($self, $path) = @_; 1751 my ($self, $path) = @_;
1254 1752
1255 utf8::encode $path; 1753 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1754 #aio_open $path, O_RDONLY, 0
1257 or return; 1755 # or return;
1258 1756
1259 $self->_load_header ($path) 1757 $self->_load_header ($path)
1260 or return; 1758 or return;
1261 1759
1262 $self->{load_path} = $path; 1760 $self->{load_path} = $path;
1263 1761
1264 1 1762 1
1265} 1763}
1266 1764
1267sub load_orig { 1765sub load_header_orig {
1268 my ($self) = @_; 1766 my ($self) = @_;
1269 1767
1270 $self->load_header_from ($self->load_path) 1768 $self->load_header_from ($self->load_path)
1271} 1769}
1272 1770
1273sub load_temp { 1771sub load_header_temp {
1274 my ($self) = @_; 1772 my ($self) = @_;
1275 1773
1276 $self->load_header_from ($self->save_path) 1774 $self->load_header_from ($self->save_path)
1775}
1776
1777sub prepare_temp {
1778 my ($self) = @_;
1779
1780 $self->last_access ((delete $self->{last_access})
1781 || $cf::RUNTIME); #d#
1782 # safety
1783 $self->{instantiate_time} = $cf::RUNTIME
1784 if $self->{instantiate_time} > $cf::RUNTIME;
1785}
1786
1787sub prepare_orig {
1788 my ($self) = @_;
1789
1790 $self->{load_original} = 1;
1791 $self->{instantiate_time} = $cf::RUNTIME;
1792 $self->last_access ($cf::RUNTIME);
1793 $self->instantiate;
1277} 1794}
1278 1795
1279sub load_header { 1796sub load_header {
1280 my ($self) = @_; 1797 my ($self) = @_;
1281 1798
1282 if ($self->load_temp) { 1799 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1800 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1801 } else {
1289 $self->load_orig 1802 $self->load_header_orig
1290 or return; 1803 or return;
1291 1804 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1805 }
1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1810 $self->default_region (cf::region::find_by_path $self->{path})
1811 unless $self->default_region;
1297 1812
1298 1 1813 1
1299} 1814}
1300 1815
1301sub find; 1816sub find;
… …
1314 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1315 1830
1316 $map->load_header 1831 $map->load_header
1317 or return; 1832 or return;
1318 1833
1319 if ($map->should_reset) { 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1837 $map->reset;
1321 undef $guard; 1838 undef $guard;
1322 $map = find $path 1839 return find $path;
1323 or return;
1324 } 1840 }
1325 1841
1326 $cf::MAP{$path} = $map 1842 $cf::MAP{$path} = $map
1327 } 1843 }
1328} 1844}
1845
1846sub pre_load { }
1847sub post_load { }
1329 1848
1330sub load { 1849sub load {
1331 my ($self) = @_; 1850 my ($self) = @_;
1332 1851
1852 local $self->{deny_reset} = 1; # loading can take a long time
1853
1333 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1334 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1335 1859
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1861
1338 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1339 1863
1340 $self->alloc; 1864 $self->alloc;
1865
1866 $self->pre_load;
1867 cf::cede_to_tick;
1868
1341 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1870 or return;
1343 1871
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1346 1874
1347 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1348 utf8::encode $uniq; 1876 utf8::encode $uniq;
1349 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1350 $self->clear_unique_items; 1878 $self->clear_unique_items;
1351 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1352 } 1880 }
1353 } 1881 }
1354 1882
1355 Coro::cede; 1883 cf::cede_to_tick;
1356
1357 # now do the right thing for maps 1884 # now do the right thing for maps
1358 $self->link_multipart_objects; 1885 $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;
1365 $self->set_darkness_map;
1366 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1887 unless $self->difficulty;
1368 Coro::cede; 1888 cf::cede_to_tick;
1889
1890 unless ($self->{deny_activate}) {
1891 $self->decay_objects;
1892 $self->fix_auto_apply;
1893 $self->update_buttons;
1894 cf::cede_to_tick;
1895 $self->set_darkness_map;
1896 cf::cede_to_tick;
1369 $self->activate; 1897 $self->activate;
1370 } 1898 }
1371 1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1904 }
1905
1906 $self->post_load;
1373} 1907}
1374 1908
1375sub customise_for { 1909sub customise_for {
1376 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1377 1911
1378 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player; 1913 if $self->per_player;
1380 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1381 $self 1918 $self
1382} 1919}
1383 1920
1384# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1385sub load_diag { 1922sub load_neighbours {
1386 my ($map) = @_; 1923 my ($map) = @_;
1387 1924
1388 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1389 1926
1390 for (0 .. 3) { 1927 for (0 .. 3) {
1391 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1392 or next; 1929 or next;
1393 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1394 or next; 1931 or next;
1395 $neigh->load; 1932 $neigh->load;
1396 1933
1934 push @neigh,
1397 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1398 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1399 } 1937 }
1400 1938
1401 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1402 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1403 or next; 1942 or next;
1404 $neigh->load; 1943 $neigh->load;
1405 } 1944 }
1406} 1945}
1407 1946
… …
1412} 1951}
1413 1952
1414sub do_load_sync { 1953sub do_load_sync {
1415 my ($map) = @_; 1954 my ($map) = @_;
1416 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1417 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1418} 1960}
1419 1961
1420our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1963our $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 1964
1434sub find_async { 1965sub find_async {
1435 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1436 1967
1437 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1438 1969
1439 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1972 }
1973
1974 $MAP_PREFETCH{$path} |= $load;
1975
1976 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) {
1980 $map->load if $v;
1981 }
1982
1983 delete $MAP_PREFETCH{$k};
1984 }
1985 }
1986 undef $MAP_PREFETCHER;
1441 } 1987 };
1442
1443 $MAP_PREFETCH{$path} = 0;
1444 $MAP_PREFETCHER->ready; 1988 $MAP_PREFETCHER->prio (6);
1445 1989
1446 () 1990 ()
1447} 1991}
1448 1992
1449sub save { 1993sub save {
1450 my ($self) = @_; 1994 my ($self) = @_;
1451 1995
1452 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1453 1997
1454 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1455 1999
1456 return unless $self->dirty; 2000 return unless $self->dirty;
1457 2001
… …
1480 my ($self) = @_; 2024 my ($self) = @_;
1481 2025
1482 # save first because save cedes 2026 # save first because save cedes
1483 $self->save; 2027 $self->save;
1484 2028
1485 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1486 2030
1487 return if $self->players; 2031 return if $self->players;
1488 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1489 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1490 2034
… …
1494 2038
1495sub reset_at { 2039sub reset_at {
1496 my ($self) = @_; 2040 my ($self) = @_;
1497 2041
1498 # TODO: safety, remove and allow resettable per-player maps 2042 # 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}; 2043 return 1e99 if $self->{deny_reset};
1501 2044
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2046 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 2047
… …
1509 my ($self) = @_; 2052 my ($self) = @_;
1510 2053
1511 $self->reset_at <= $cf::RUNTIME 2054 $self->reset_at <= $cf::RUNTIME
1512} 2055}
1513 2056
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 { 2057sub reset {
1529 my ($self) = @_; 2058 my ($self) = @_;
1530 2059
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 2061
1533 return if $self->players; 2062 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d#
1535 2063
1536 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
2065
2066 $self->in_memory (cf::MAP_SWAPPED);
2067
2068 # need to save uniques path
2069 unless ($self->{deny_save}) {
2070 my $uniq = $self->uniq_path; utf8::encode $uniq;
2071
2072 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2073 if $uniq;
2074 }
1537 2075
1538 delete $cf::MAP{$self->path}; 2076 delete $cf::MAP{$self->path};
1539 2077
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 2078 $self->clear;
1542 2079
1543 $_->clear_links_to ($self) for values %cf::MAP; 2080 $_->clear_links_to ($self) for values %cf::MAP;
1544 2081
1545 $self->unlink_save; 2082 $self->unlink_save;
… …
1549my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
1550 2087
1551sub nuke { 2088sub nuke {
1552 my ($self) = @_; 2089 my ($self) = @_;
1553 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2094 delete $cf::MAP{$self->path};
2095
2096 bless $self, "cf::map";
2097 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103
2104 $cf::MAP{$self->path} = $self;
2105 }
2106
1557 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2108}
2109
2110=item $maps = cf::map::tmp_maps
2111
2112Returns an arrayref with all map paths of currently instantiated and saved
2113maps. May block.
2114
2115=cut
2116
2117sub tmp_maps() {
2118 [
2119 map {
2120 utf8::decode $_;
2121 /\.map$/
2122 ? normalise $_
2123 : ()
2124 } @{ aio_readdir $TMPDIR or [] }
2125 ]
2126}
2127
2128=item $maps = cf::map::random_maps
2129
2130Returns an arrayref with all map paths of currently instantiated and saved
2131random maps. May block.
2132
2133=cut
2134
2135sub random_maps() {
2136 [
2137 map {
2138 utf8::decode $_;
2139 /\.map$/
2140 ? normalise "?random/$_"
2141 : ()
2142 } @{ aio_readdir $RANDOMDIR or [] }
2143 ]
1558} 2144}
1559 2145
1560=item cf::map::unique_maps 2146=item cf::map::unique_maps
1561 2147
1562Returns an arrayref of paths of all shared maps that have 2148Returns an arrayref of paths of all shared maps that have
1563instantiated unique items. May block. 2149instantiated unique items. May block.
1564 2150
1565=cut 2151=cut
1566 2152
1567sub unique_maps() { 2153sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2154 [
1569 or return; 2155 map {
1570
1571 my @paths;
1572
1573 for (@$files) {
1574 utf8::decode $_; 2156 utf8::decode $_;
1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//; 2157 /\.map$/
1579 push @paths, $_; 2158 ? normalise $_
2159 : ()
2160 } @{ aio_readdir $UNIQUEDIR or [] }
1580 } 2161 ]
1581
1582 \@paths
1583} 2162}
1584 2163
1585package cf; 2164package cf;
1586 2165
1587=back 2166=back
… …
1633 2212
1634 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2213 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1635 2214
1636 if ($self->{record_replies}) { 2215 if ($self->{record_replies}) {
1637 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2216 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2217
1638 } else { 2218 } else {
2219 my $pl = $self->contr;
2220
2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2222 my $dialog = $pl->{npc_dialog};
2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2224
2225 } else {
1639 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
1640 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2228 }
1641 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
1642} 2240}
1643 2241
1644=item $player_object->may ("access") 2242=item $player_object->may ("access")
1645 2243
1646Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
1678=cut 2276=cut
1679 2277
1680sub link_map { 2278sub link_map {
1681 unless ($LINK_MAP) { 2279 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 2280 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2281 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 2282 $LINK_MAP->load;
1685 } 2283 }
1686 2284
1687 $LINK_MAP 2285 $LINK_MAP
1688} 2286}
… …
1693 $self->deactivate_recursive; 2291 $self->deactivate_recursive;
1694 2292
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2293 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 2294
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2295 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 2296 if $self->map && $self->map->{path} ne "{link}";
1699 2297
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2298 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 2299}
1702 2300
1703sub cf::object::player::leave_link { 2301sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 2302 my ($self, $map, $x, $y) = @_;
2303
2304 return unless $self->contr->active;
1705 2305
1706 my $link_pos = delete $self->{_link_pos}; 2306 my $link_pos = delete $self->{_link_pos};
1707 2307
1708 unless ($map) { 2308 unless ($map) {
1709 # restore original map position 2309 # restore original map position
… …
1723 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
1724 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
1725 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
1726 2326
1727 $map->load; 2327 $map->load;
1728 $map->load_diag; 2328 $map->load_neighbours;
1729 2329
1730 return unless $self->contr->active; 2330 return unless $self->contr->active;
1731 $self->activate_recursive; 2331 $self->activate_recursive;
2332
2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
1733} 2335}
1734 2336
1735cf::player->attach ( 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1736 on_logout => sub {
1737 my ($pl) = @_;
1738 2338
1739 # abort map switching before logout 2339Moves the player to the given map-path and coordinates by first freezing
1740 if ($pl->ob->{_link_pos}) { 2340her, loading and preparing them map, calling the provided $check callback
1741 cf::sync_job { 2341that has to return the map if sucecssful, and then unfreezes the player on
1742 $pl->ob->leave_link 2342the new (success) or old (failed) map position. In either case, $done will
1743 }; 2343be called at the end of this process.
1744 }
1745 },
1746 on_login => sub {
1747 my ($pl) = @_;
1748 2344
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)
1768
1769=cut 2345=cut
2346
2347our $GOTOGEN;
1770 2348
1771sub cf::object::player::goto { 2349sub cf::object::player::goto {
1772 my ($self, $path, $x, $y) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2351
2352 # do generation counting so two concurrent goto's will be executed in-order
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1773 2354
1774 $self->enter_link; 2355 $self->enter_link;
1775 2356
1776 (async { 2357 (async {
2358 my $map = eval {
1777 my $map = cf::map::find $path; 2359 my $map = cf::map::find $path;
2360
2361 if ($map) {
1778 $map = $map->customise_for ($self) if $map; 2362 $map = $map->customise_for ($self);
1779 2363 $map = $check->($map) if $check && $map;
1780# warn "entering ", $map->path, " at ($x, $y)\n" 2364 } else {
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2366 }
1784 2367
2368 $map
2369 };
2370
2371 if ($@) {
2372 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2373 LOG llevError | logBacktrace, Carp::longmess $@;
2374 }
2375
2376 if ($gen == $self->{_goto_generation}) {
2377 delete $self->{_goto_generation};
1785 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2379 }
2380
2381 $done->() if $done;
1786 })->prio (1); 2382 })->prio (1);
1787} 2383}
1788 2384
1789=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
1790 2386
… …
1792 2388
1793sub parse_random_map_params { 2389sub parse_random_map_params {
1794 my ($spec) = @_; 2390 my ($spec) = @_;
1795 2391
1796 my $rmp = { # defaults 2392 my $rmp = { # defaults
1797 xsize => 10, 2393 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 2394 ysize => (cf::rndm 15, 40),
2395 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2396 #layout => string,
1799 }; 2397 };
1800 2398
1801 for (split /\n/, $spec) { 2399 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 2400 my ($k, $v) = split /\s+/, $_, 2;
1803 2401
… …
1807 $rmp 2405 $rmp
1808} 2406}
1809 2407
1810sub prepare_random_map { 2408sub prepare_random_map {
1811 my ($exit) = @_; 2409 my ($exit) = @_;
2410
2411 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 2412
1813 # all this does is basically replace the /! path by 2413 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 2414 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 2415 # that depends on the exit object
1816 2416
1817 my $rmp = parse_random_map_params $exit->msg; 2417 my $rmp = parse_random_map_params $exit->msg;
1818 2418
1819 if ($exit->map) { 2419 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 2420 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 2421 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2422 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2423 $rmp->{origin_y} = $exit->y;
1824 } 2424 }
1825 2425
1826 $rmp->{random_seed} ||= $exit->random_seed; 2426 $rmp->{random_seed} ||= $exit->random_seed;
1827 2427
1828 my $data = cf::to_json $rmp; 2428 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2429 my $md5 = Digest::MD5::md5_hex $data;
2430 my $meta = "$RANDOMDIR/$md5.meta";
1830 2431
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2432 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2433 aio_write $fh, 0, (length $data), $data, 0;
2434 undef $fh;
2435 aio_rename "$meta~", $meta;
1833 2436
1834 $exit->slaying ("?random/$md5"); 2437 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2438 $exit->msg (undef);
1836 } 2439 }
1837} 2440}
… …
1839sub cf::object::player::enter_exit { 2442sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2443 my ($self, $exit) = @_;
1841 2444
1842 return unless $self->type == cf::PLAYER; 2445 return unless $self->type == cf::PLAYER;
1843 2446
2447 if ($exit->slaying eq "/!") {
2448 #TODO: this should de-fi-ni-te-ly not be a sync-job
2449 # the problem is that $exit might not survive long enough
2450 # so it needs to be done right now, right here
2451 cf::sync_job { prepare_random_map $exit };
2452 }
2453
2454 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2455 my $hp = $exit->stats->hp;
2456 my $sp = $exit->stats->sp;
2457
1844 $self->enter_link; 2458 $self->enter_link;
2459
2460 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED);
1845 2463
1846 (async { 2464 (async {
1847 $self->deactivate_recursive; # just to be sure 2465 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2466 unless (eval {
1849 prepare_random_map $exit 2467 $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 2468
1855 1; 2469 1;
1856 }) { 2470 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2471 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2472 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2473 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2474 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2475
1862 warn "ERROR in enter_exit: $@"; 2476 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2477 $self->leave_link;
1864 } 2478 }
1865 })->prio (1); 2479 })->prio (1);
… …
1878 2492
1879sub cf::client::send_drawinfo { 2493sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2494 my ($self, $text, $flags) = @_;
1881 2495
1882 utf8::encode $text; 2496 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2498}
1885 2499
2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2501
2502Send a drawinfo or msg packet to the client, formatting the msg for the
2503client if neccessary. C<$type> should be a string identifying the type of
2504the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet.
2506
2507=cut
2508
2509sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_;
2511
2512 $msg = $self->pl->expand_cfpod ($msg);
2513
2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515
2516 if (ref $channel) {
2517 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel);
2521 }
2522
2523 $channel = $channel->{id};
2524 }
2525
2526 return unless @extra || length $msg;
2527
2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2535 } else {
2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg")
2557 }
2558 }
2559 }
2560}
2561
2562=item $client->ext_msg ($type, @msg)
2563
2564Sends an ext event to the client.
2565
2566=cut
2567
2568sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_;
2570
2571 if ($self->extcmd == 2) {
2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2574 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 }
2595}
1886 2596
1887=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
1888 2598
1889Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2600the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1891C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2601C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1892 2602
1893Queries can fail, so check the return code. Or don't, as queries will become 2603Queries can fail, so check the return code. Or don't, as queries will
1894reliable at some point in the future. 2604become reliable at some point in the future.
1895 2605
1896=cut 2606=cut
1897 2607
1898sub cf::client::query { 2608sub cf::client::query {
1899 my ($self, $flags, $text, $cb) = @_; 2609 my ($self, $flags, $text, $cb) = @_;
… …
1907 utf8::encode $text; 2617 utf8::encode $text;
1908 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2618 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1909 2619
1910 $self->send_packet ($self->{query_queue}[0][0]) 2620 $self->send_packet ($self->{query_queue}[0][0])
1911 if @{ $self->{query_queue} } == 1; 2621 if @{ $self->{query_queue} } == 1;
2622
2623 1
1912} 2624}
1913 2625
1914cf::client->attach ( 2626cf::client->attach (
2627 on_connect => sub {
2628 my ($ns) = @_;
2629
2630 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2631 },
1915 on_reply => sub { 2632 on_reply => sub {
1916 my ($ns, $msg) = @_; 2633 my ($ns, $msg) = @_;
1917 2634
1918 # this weird shuffling is so that direct followup queries 2635 # this weird shuffling is so that direct followup queries
1919 # get handled first 2636 # get handled first
1920 my $queue = delete $ns->{query_queue} 2637 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2638 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2639
1923 (shift @$queue)->[1]->($msg); 2640 (shift @$queue)->[1]->($msg);
2641 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2642
1925 push @{ $ns->{query_queue} }, @$queue; 2643 push @{ $ns->{query_queue} }, @$queue;
1926 2644
1927 if (@{ $ns->{query_queue} } == @$queue) { 2645 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2646 if (@$queue) {
… …
1930 } else { 2648 } else {
1931 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2649 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1932 } 2650 }
1933 } 2651 }
1934 }, 2652 },
2653 on_exticmd => sub {
2654 my ($ns, $buf) = @_;
2655
2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2657
2658 if (ref $msg) {
2659 my ($type, $reply, @payload) =
2660 "ARRAY" eq ref $msg
2661 ? @$msg
2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2663
2664 my @reply;
2665
2666 if (my $cb = $EXTICMD{$type}) {
2667 @reply = $cb->($ns, @payload);
2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2673 } else {
2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2675 }
2676
2677 cf::override;
2678 },
1935); 2679);
1936 2680
1937=item $client->async (\&cb) 2681=item $client->async (\&cb)
1938 2682
1939Create a new coroutine, running the specified callback. The coroutine will 2683Create a new coroutine, running the specified callback. The coroutine will
… …
1980our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
1981our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
1982 2726
1983$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
1984 2728
1985$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
1986 2734
1987# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
1988 2736
1989=pod 2737=pod
1990 2738
1991The following fucntions and emthods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
1992 2740
1993 cf::object contr pay_amount pay_player map 2741 cf::object
2742 contr pay_amount pay_player map x y force_find force_add
2743 insert remove name archname title slaying race decrease_ob_nr
2744
1994 cf::object::player player 2745 cf::object::player
1995 cf::player peaceful 2746 player
1996 cf::map trigger 2747
2748 cf::player
2749 peaceful
2750
2751 cf::map
2752 trigger
1997 2753
1998=cut 2754=cut
1999 2755
2000for ( 2756for (
2001 ["cf::object" => qw(contr pay_amount pay_player map)], 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2759 decrease_ob_nr)],
2002 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2003 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2004 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2005) { 2763) {
2006 no strict 'refs'; 2764 no strict 'refs';
… …
2077=back 2835=back
2078 2836
2079=cut 2837=cut
2080 2838
2081############################################################################# 2839#############################################################################
2840# the server's init and main functions
2082 2841
2083=head2 EXTENSION DATABASE SUPPORT 2842sub load_facedata($) {
2843 my ($path) = @_;
2084 2844
2085Crossfire maintains a very simple database for extension use. It can 2845 # HACK to clear player env face cache, we need some signal framework
2086currently store anything that can be serialised using Storable, which 2846 # for this (global event?)
2087excludes objects. 2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2088 2848
2089The parameter C<$family> should best start with the name of the extension 2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2090using it, it should be unique.
2091 2850
2092=over 4 2851 warn "loading facedata from $path\n";
2093 2852
2094=item $hashref = cf::db_get $family 2853 my $facedata;
2854 0 < aio_load $path, $facedata
2855 or die "$path: $!";
2095 2856
2096Return a hashref for use by the extension C<$family>, which can be 2857 $facedata = Coro::Storable::thaw $facedata;
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099 2858
2100=item $value = cf::db_get $family => $key 2859 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2101 2861
2102Returns a single value from the database 2862 # patch in the exptable
2103 2863 $facedata->{resource}{"res/exp_table"} = {
2104=item cf::db_put $family => $hashref 2864 type => FT_RSRC,
2105 2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
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 }
2132
2133 my $pid;
2134
2135 sub db_save() {
2136 waitpid $pid, 0 if $pid;
2137 if (0 == ($pid = fork)) {
2138 $DB->{_meta}{version} = 1;
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 }); 2866 };
2867 cf::cede_to_tick;
2155 2868
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 } 2869 {
2870 my $faces = $facedata->{faceinfo};
2160 2871
2161 sub db_get($;$) { 2872 while (my ($face, $info) = each %$faces) {
2162 @_ >= 2 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2163 ? $DB->{$_[0]}{$_[1]} 2874 cf::face::set_visibility $idx, $info->{visibility};
2164 : ($DB->{$_[0]} ||= { }) 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2165 } 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2166 2878
2167 sub db_put($$;$) { 2879 cf::cede_to_tick;
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 }, 2880 }
2181 );
2182}
2183 2881
2184############################################################################# 2882 while (my ($face, $info) = each %$faces) {
2185# the server's main() 2883 next unless $info->{smooth};
2884 my $idx = cf::face::find $face
2885 or next;
2886 if (my $smooth = cf::face::find $info->{smooth}) {
2887 cf::face::set_smooth $idx, $smooth;
2888 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2889 } else {
2890 warn "smooth face '$info->{smooth}' not found for face '$face'";
2891 }
2186 2892
2187sub cfg_load { 2893 cf::cede_to_tick;
2894 }
2895 }
2896
2897 {
2898 my $anims = $facedata->{animinfo};
2899
2900 while (my ($anim, $info) = each %$anims) {
2901 cf::anim::set $anim, $info->{frames}, $info->{facings};
2902 cf::cede_to_tick;
2903 }
2904
2905 cf::anim::invalidate_all; # d'oh
2906 }
2907
2908 {
2909 # TODO: for gcfclient pleasure, we should give resources
2910 # that gcfclient doesn't grok a >10000 face index.
2911 my $res = $facedata->{resource};
2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2914
2915 while (my ($name, $info) = each %$res) {
2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2918
2919 if ($info->{type} & 1) {
2920 # prepend meta info
2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2928 } else {
2929 $data = $info->{data};
2930 }
2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2935 cf::cede_to_tick;
2936 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2955 }
2956
2957 1
2958}
2959
2960register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_;
2962
2963 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v);
2965 }
2966};
2967
2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2973 load_resource_file "$MAPDIR/regions"
2974 or die "unable to load regions file\n";
2975
2976 for (cf::region::list) {
2977 $_->{match} = qr/$_->{match}/
2978 if exists $_->{match};
2979 }
2980}
2981
2982sub reload_facedata {
2983 load_facedata "$DATADIR/facedata"
2984 or die "unable to load facedata\n";
2985}
2986
2987sub reload_archetypes {
2988 load_resource_file "$DATADIR/archetypes"
2989 or die "unable to load archetypes\n";
2990 #d# NEED to laod twice to resolve forward references
2991 # this really needs to be done in an extra post-pass
2992 # (which needs to be synchronous, so solve it differently)
2993 load_resource_file "$DATADIR/archetypes"
2994 or die "unable to load archetypes\n";
2995}
2996
2997sub reload_treasures {
2998 load_resource_file "$DATADIR/treasures"
2999 or die "unable to load treasurelists\n";
3000}
3001
3002sub reload_resources {
3003 warn "reloading resource files...\n";
3004
3005 reload_regions;
3006 reload_facedata;
3007 #reload_archetypes;#d#
3008 reload_archetypes;
3009 reload_treasures;
3010
3011 warn "finished reloading resource files\n";
3012}
3013
3014sub init {
3015 reload_resources;
3016}
3017
3018sub reload_config {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 3020 or return;
2190 3021
2191 local $/; 3022 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
2193 3024
… …
2207 3038
2208sub main { 3039sub main {
2209 # we must not ever block the main coroutine 3040 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 3041 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async {
2212 async { Event::one_event }; 3044 Event::one_event;
3045 })->prio (Coro::PRIO_MAX);
2213 }; 3046 };
2214 3047
2215 cfg_load; 3048 reload_config;
2216 db_load; 3049 db_init;
2217 load_extensions; 3050 load_extensions;
3051
3052 $TICK_WATCHER->start;
2218 Event::loop; 3053 Event::loop;
2219} 3054}
2220 3055
2221############################################################################# 3056#############################################################################
2222# initialisation and cleanup 3057# initialisation and cleanup
2223 3058
2224# install some emergency cleanup handlers 3059# install some emergency cleanup handlers
2225BEGIN { 3060BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 3061 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 3062 Event->signal (
3063 reentrant => 0,
2228 data => WF_AUTOCANCEL, 3064 data => WF_AUTOCANCEL,
2229 signal => $signal, 3065 signal => $signal,
3066 prio => 0,
2230 cb => sub { 3067 cb => sub {
2231 cf::cleanup "SIG$signal"; 3068 cf::cleanup "SIG$signal";
2232 }, 3069 },
2233 ); 3070 );
2234 } 3071 }
3072}
3073
3074sub write_runtime {
3075 my $runtime = "$LOCALDIR/runtime";
3076
3077 # first touch the runtime file to show we are still running:
3078 # the fsync below can take a very very long time.
3079
3080 IO::AIO::aio_utime $runtime, undef, undef;
3081
3082 my $guard = cf::lock_acquire "write_runtime";
3083
3084 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3085 or return;
3086
3087 my $value = $cf::RUNTIME + 90 + 10;
3088 # 10 is the runtime save interval, for a monotonic clock
3089 # 60 allows for the watchdog to kill the server.
3090
3091 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3092 and return;
3093
3094 # always fsync - this file is important
3095 aio_fsync $fh
3096 and return;
3097
3098 # touch it again to show we are up-to-date
3099 aio_utime $fh, undef, undef;
3100
3101 close $fh
3102 or return;
3103
3104 aio_rename "$runtime~", $runtime
3105 and return;
3106
3107 warn "runtime file written.\n";
3108
3109 1
2235} 3110}
2236 3111
2237sub emergency_save() { 3112sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop; 3113 my $freeze_guard = cf::freeze_mainloop;
2239 3114
… …
2256 my $map = $cf::MAP{$path} or next; 3131 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 3132 $map->valid or next;
2258 $map->save; 3133 $map->save;
2259 } 3134 }
2260 warn "end emergency map save\n"; 3135 warn "end emergency map save\n";
3136
3137 warn "begin emergency database checkpoint\n";
3138 BDB::db_env_txn_checkpoint $DB_ENV;
3139 warn "end emergency database checkpoint\n";
2261 }; 3140 };
2262 3141
2263 warn "leave emergency perl save\n"; 3142 warn "leave emergency perl save\n";
2264} 3143}
2265 3144
3145sub post_cleanup {
3146 my ($make_core) = @_;
3147
3148 warn Carp::longmess "post_cleanup backtrace"
3149 if $make_core;
3150}
3151
2266sub reload() { 3152sub do_reload_perl() {
2267 # can/must only be called in main 3153 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 3154 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 3155 warn "can only reload from main coroutine";
2270 return; 3156 return;
2271 } 3157 }
2272 3158
2273 warn "reloading..."; 3159 warn "reloading...";
2274 3160
2275 warn "freezing server"; 3161 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 3162
3163 cf::sync_job {
3164 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 3165 cf::emergency_save;
3166 cf::write_runtime; # external watchdog should not bark
2278 3167
2279 warn "sync database to disk"; 3168 warn "syncing database to disk";
2280 cf::db_sync; 3169 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 3170
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 3171 # if anything goes wrong in here, we should simply crash as we already saved
2285 3172
2286 warn "cancel all watchers"; 3173 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 3174 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 3175 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 3176 }
2290 3177
3178 warn "flushing outstanding aio requests";
3179 for (;;) {
3180 BDB::flush;
3181 IO::AIO::flush;
3182 Coro::cede;
3183 last unless IO::AIO::nreqs || BDB::nreqs;
3184 warn "iterate...";
3185 }
3186
3187 ++$RELOAD;
3188
2291 warn "cancel all extension coros"; 3189 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 3190 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 3191 %EXT_CORO = ();
2294 3192
2295 warn "remove commands"; 3193 warn "removing commands";
2296 %COMMAND = (); 3194 %COMMAND = ();
2297 3195
2298 warn "remove ext commands"; 3196 warn "removing ext/exti commands";
2299 %EXTCMD = (); 3197 %EXTCMD = ();
3198 %EXTICMD = ();
2300 3199
2301 warn "unload/nuke all extensions"; 3200 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 3201 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 3202 warn "... unloading $pkg";
2304 3203
2305 if (my $cb = $pkg->can ("unload")) { 3204 if (my $cb = $pkg->can ("unload")) {
2306 eval { 3205 eval {
… …
2311 3210
2312 warn "... nuking $pkg"; 3211 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 3212 Symbol::delete_package $pkg;
2314 } 3213 }
2315 3214
2316 warn "unload all perl modules loaded from $LIBDIR"; 3215 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 3216 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3217 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 3218
2320 warn "removing <$k>"; 3219 warn "... unloading $k";
2321 delete $INC{$k}; 3220 delete $INC{$k};
2322 3221
2323 $k =~ s/\.pm$//; 3222 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 3223 $k =~ s/\//::/g;
2325 3224
… …
2328 } 3227 }
2329 3228
2330 Symbol::delete_package $k; 3229 Symbol::delete_package $k;
2331 } 3230 }
2332 3231
2333 warn "get rid of safe::, as good as possible"; 3232 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 3233 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3234 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 3235
2337 warn "unload cf.pm \"a bit\""; 3236 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 3237 delete $INC{"cf.pm"};
3238 delete $INC{"cf/pod.pm"};
2339 3239
2340 # don't, removes xs symbols, too, 3240 # don't, removes xs symbols, too,
2341 # and global variables created in xs 3241 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 3242 #Symbol::delete_package __PACKAGE__;
2343 3243
3244 warn "unload completed, starting to reload now";
3245
2344 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
2345 require cf; 3247 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 3249
2348 warn "load config and database again"; 3250 warn "loading config and database again";
2349 cf::cfg_load; 3251 cf::reload_config;
2350 cf::db_load;
2351 3252
2352 warn "load extensions"; 3253 warn "loading extensions";
2353 cf::load_extensions; 3254 cf::load_extensions;
2354 3255
2355 warn "reattach attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";
2356 _global_reattach; 3257 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 3258 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 3259 reattach $_ for values %MAP;
2359 }; 3260 warn "reattaching attachments to players";
3261 reattach $_ for values %PLAYER;
2360 3262
2361 if ($@) { 3263 warn "leaving sync_job";
3264
3265 1
3266 } or do {
2362 warn $@; 3267 warn $@;
2363 warn "error while reloading, exiting."; 3268 warn "error while reloading, exiting.";
2364 exit 1; 3269 exit 1;
2365 } 3270 };
2366 3271
2367 warn "reloaded"; 3272 warn "reloaded";
2368}; 3273};
2369 3274
3275our $RELOAD_WATCHER; # used only during reload
3276
3277sub reload_perl() {
3278 # doing reload synchronously and two reloads happen back-to-back,
3279 # coro crashes during coro_state_free->destroy here.
3280
3281 $RELOAD_WATCHER ||= Event->timer (
3282 reentrant => 0,
3283 after => 0,
3284 data => WF_AUTOCANCEL,
3285 cb => sub {
3286 do_reload_perl;
3287 undef $RELOAD_WATCHER;
3288 },
3289 );
3290}
3291
2370register_command "reload" => sub { 3292register_command "reload" => sub {
2371 my ($who, $arg) = @_; 3293 my ($who, $arg) = @_;
2372 3294
2373 if ($who->flag (FLAG_WIZ)) { 3295 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 3296 $who->message ("reloading server.");
3297 async { reload_perl };
2377 } 3298 }
2378}; 3299};
2379 3300
2380unshift @INC, $LIBDIR; 3301unshift @INC, $LIBDIR;
2381 3302
3303my $bug_warning = 0;
3304
3305our @WAIT_FOR_TICK;
3306our @WAIT_FOR_TICK_BEGIN;
3307
3308sub wait_for_tick {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main;
3311
3312 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK, $signal;
3314 $signal->wait;
3315}
3316
3317sub wait_for_tick_begin {
3318 return unless $TICK_WATCHER->is_active;
3319 return if $Coro::current == $Coro::main;
3320
3321 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait;
3324}
3325
3326 my $min = 1e6;#d#
3327 my $avg = 10;
2382$TICK_WATCHER = Event->timer ( 3328$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 3329 reentrant => 0,
3330 parked => 1,
2384 prio => 0, 3331 prio => 0,
2385 at => $NEXT_TICK || $TICK, 3332 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 3333 data => WF_AUTOCANCEL,
2387 cb => sub { 3334 cb => sub {
3335 if ($Coro::current != $Coro::main) {
3336 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3337 unless ++$bug_warning > 10;
3338 return;
3339 }
3340
2388 $NOW = Event::time; 3341 $NOW = $tick_start = Event::time;
2389 3342
2390 cf::server_tick; # one server iteration 3343 cf::server_tick; # one server iteration
3344
3345 0 && sync_job {#d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 };
3367
2391 $RUNTIME += $TICK; 3368 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 3369 $NEXT_TICK += $TICK;
2393 3370
2394 $WAIT_FOR_TICK->broadcast; 3371 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3372 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool {
3374 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!";
3376 };
3377 }
3378
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send;
3384 }
3385 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send;
3387 }
3388
3389 $NOW = Event::time;
2396 3390
2397 # if we are delayed by four ticks or more, skip them all 3391 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3392 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2399 3393
2400 $TICK_WATCHER->at ($NEXT_TICK); 3394 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 3395 $TICK_WATCHER->start;
3396
3397 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399
3400 _post_tick;
3401
3402
2402 }, 3403 },
2403); 3404);
2404 3405
3406{
2405IO::AIO::max_poll_time $TICK * 0.2; 3407 BDB::max_poll_time $TICK * 0.1;
2406 3408 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 3409 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 3410 fd => BDB::poll_fileno,
2409 poll => 'r', 3411 poll => 'r',
2410 prio => 5, 3412 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 3413 data => WF_AUTOCANCEL,
2417 after => 0, 3414 cb => \&BDB::poll_cb,
2418 interval => 10, 3415 );
2419 cb => sub { 3416 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 3417
2421 write_runtime 3418 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 3419 my $status;
3420 my $current = $Coro::current;
3421 (
3422 sub {
3423 $status = $!;
3424 $current->ready; undef $current;
3425 },
3426 sub {
3427 Coro::schedule while defined $current;
3428 $! = $status;
3429 },
3430 )
3431 };
3432
3433 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create;
3435
3436 cf::sync_job {
3437 eval {
3438 BDB::db_env_open
3439 $DB_ENV,
3440 $BDBDIR,
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666;
3444
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 };
3450
3451 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 3452 };
2424 }, 3453 }
2425); 3454}
3455
3456{
3457 IO::AIO::min_parallel 8;
3458
3459 undef $Coro::AIO::WATCHER;
3460 IO::AIO::max_poll_time $TICK * 0.1;
3461 $AIO_POLL_WATCHER = Event->io (
3462 reentrant => 0,
3463 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno,
3465 poll => 'r',
3466 prio => 6,
3467 cb => \&IO::AIO::poll_cb,
3468 );
3469}
3470
3471my $_log_backtrace;
3472
3473sub _log_backtrace {
3474 my ($msg, @addr) = @_;
3475
3476 $msg =~ s/\n//;
3477
3478 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace;
3481 async {
3482 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!";
3487
3488 my @funcs;
3489 my @res = <$fh>;
3490 chomp for @res;
3491 while (@res) {
3492 my ($func, $line) = splice @res, 0, 2, ();
3493 push @funcs, "[$func] $line";
3494 }
3495
3496 @funcs
3497 };
3498
3499 LOG llevInfo, "[ABT] $msg\n";
3500 LOG llevInfo, "[ABT] $_\n" for @bt;
3501 --$_log_backtrace;
3502 };
3503 } else {
3504 LOG llevInfo, "[ABT] $msg\n";
3505 LOG llevInfo, "[ABT] [suppressed]\n";
3506 }
3507}
3508
3509# load additional modules
3510use cf::pod;
2426 3511
2427END { cf::emergency_save } 3512END { cf::emergency_save }
2428 3513
24291 35141
2430 3515

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines