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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.348 by root, Thu Aug 30 08:34:40 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# load/save/clean perl data associated with a map
906 1248
907*cf::mapsupport::on_clean = sub { 1249=back
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 1250
920=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
921 1252
922Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
923 1254
… …
936Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
937 1268
938=cut 1269=cut
939 1270
940sub playerdir($) { 1271sub playerdir($) {
941 cf::localdir 1272 "$PLAYERDIR/"
942 . "/"
943 . cf::playerdir
944 . "/"
945 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
946} 1274}
947 1275
948sub path($) { 1276sub path($) {
949 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
950 1278
951 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
952} 1280}
953 1281
954sub find_active($) { 1282sub find_active($) {
955 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
956 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
… …
959 1287
960sub exists($) { 1288sub exists($) {
961 my ($login) = @_; 1289 my ($login) = @_;
962 1290
963 $cf::PLAYER{$login} 1291 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 1292 or cf::sync_job { !aio_stat path $login }
965} 1293}
966 1294
967sub find($) { 1295sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 1296 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 1297 my $login = $_[0];
970 1298
971 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
972 1300
973 $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
974 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
975 or return; 1310 or return;
976 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
977 } 1312 }
978 } 1313 }
… …
990 1325
991 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
992 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
993 1328
994 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
995 Coro::cede; 1330 cf::cede_to_tick;
996} 1331}
997 1332
998sub new($) { 1333sub new($) {
999 my ($login) = @_; 1334 my ($login) = @_;
1000 1335
… …
1006 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1007 1342
1008 $self 1343 $self
1009} 1344}
1010 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
1011=item $pl->quit_character 1356=item $pl->quit_character
1012 1357
1013Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1014be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1015 1360
1016=cut 1361=cut
1017 1362
1018sub quit_character { 1363sub quit_character {
1019 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1020 1367
1021 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1022 $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
1023 1370
1024 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1029 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1030 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1031 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1032 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1033 $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
1034 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;
1035} 1402}
1036 1403
1037=item cf::player::list_logins 1404=item cf::player::list_logins
1038 1405
1039Returns 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
1040while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1041 1408
1042=cut 1409=cut
1043 1410
1044sub list_logins { 1411sub list_logins {
1045 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1046 or return []; 1413 or return [];
1047 1414
1048 my @logins; 1415 my @logins;
1049 1416
1050 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
… …
1067=cut 1434=cut
1068 1435
1069sub maps($) { 1436sub maps($) {
1070 my ($pl) = @_; 1437 my ($pl) = @_;
1071 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1072 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1073 or return; 1442 or return;
1074 1443
1075 my @paths; 1444 my @paths;
1076 1445
1077 for (@$files) { 1446 for (@$files) {
1078 utf8::decode $_; 1447 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1081 1450
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1451 push @paths, cf::map::normalise "~$pl/$_";
1083 } 1452 }
1084 1453
1085 \@paths 1454 \@paths
1086} 1455}
1087 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
1088=item $player->ext_reply ($msgid, $msgtype, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1089 1508
1090Sends an ext reply to the player. 1509Sends an ext reply to the player.
1091 1510
1092=cut 1511=cut
1093 1512
1094sub ext_reply($$$%) { 1513sub ext_reply($$@) {
1095 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1096 1515
1097 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1098
1099 $self->send ("ext " . cf::to_json \%msg);
1100} 1517}
1101 1518
1102package 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}
1103 1559
1104=back 1560=back
1105
1106 1561
1107=head3 cf::map 1562=head3 cf::map
1108 1563
1109=over 4 1564=over 4
1110 1565
… …
1114 1569
1115use Fcntl; 1570use Fcntl;
1116use Coro::AIO; 1571use Coro::AIO;
1117 1572
1118use overload 1573use overload
1119 '""' => \&as_string; 1574 '""' => \&as_string,
1575 fallback => 1;
1120 1576
1121our $MAX_RESET = 3600; 1577our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1578our $DEFAULT_RESET = 3000;
1123 1579
1124sub generate_random_map { 1580sub generate_random_map {
1125 my ($self, $rmp) = @_; 1581 my ($self, $rmp) = @_;
1126
1127 # mit "rum" bekleckern, nicht 1582 # mit "rum" bekleckern, nicht
1128 $self->_create_random_map ( 1583 $self->_create_random_map (
1129 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1130 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1131 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1138 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1139 (cf::region::find $rmp->{region}), $rmp->{custom} 1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1140 ) 1595 )
1141} 1596}
1142 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
1143sub register { 1606sub register {
1144 my (undef, $regex) = @_; 1607 my (undef, $regex, $prio) = @_;
1145 my $pkg = caller; 1608 my $pkg = caller;
1146 1609
1147 no strict; 1610 no strict;
1148 push @{"$pkg\::ISA"}, __PACKAGE__; 1611 push @{"$pkg\::ISA"}, __PACKAGE__;
1149 1612
1150 $EXT_MAP{$pkg} = qr<$regex>; 1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1151} 1614}
1152 1615
1153# also paths starting with '/' 1616# also paths starting with '/'
1154$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}
1155 1628
1156sub normalise { 1629sub normalise {
1157 my ($path, $base) = @_; 1630 my ($path, $base) = @_;
1631
1632 $path = "$path"; # make sure its a string
1633
1634 $path =~ s/\.map$//;
1158 1635
1159 # map plan: 1636 # map plan:
1160 # 1637 #
1161 # /! non-realised random map exit (special hack!) 1638 # /! non-realised random map exit (special hack!)
1162 # {... are special paths that are not being touched 1639 # {... are special paths that are not being touched
… …
1190 1667
1191 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
1192 1669
1193 $path = normalise $path, $base; 1670 $path = normalise $path, $base;
1194 1671
1195 for my $pkg (keys %EXT_MAP) { 1672 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1673 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1674 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1675 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1200 return $self; 1677 return $self;
1201 } 1678 }
1202 } 1679 }
1203 1680
1204 Carp::carp "unable to resolve path '$path'."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1205 () 1682 ()
1206} 1683}
1207 1684
1208sub init { 1685sub init {
1209 my ($self) = @_; 1686 my ($self) = @_;
… …
1220# the displayed name, this is a one way mapping 1697# the displayed name, this is a one way mapping
1221sub visible_name { 1698sub visible_name {
1222 &as_string 1699 &as_string
1223} 1700}
1224 1701
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1702# the original (read-only) location
1233sub load_path { 1703sub load_path {
1234 my ($self) = @_; 1704 my ($self) = @_;
1235 1705
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1237} 1707}
1238 1708
1239# the temporary/swap location 1709# the temporary/swap location
1240sub save_path { 1710sub save_path {
1241 my ($self) = @_; 1711 my ($self) = @_;
1242 1712
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1714 "$TMPDIR/$path.map"
1244} 1715}
1245 1716
1246# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1247sub uniq_path { 1718sub uniq_path {
1248 my ($self) = @_; 1719 my ($self) = @_;
1249 1720
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1722 "$UNIQUEDIR/$path"
1251} 1723}
1252 1724
1253# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1254# all maps in C++... 1726# all maps in C++...
1255sub change_all_map_light { 1727sub change_all_map_light {
… …
1257 1729
1258 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1259 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1260} 1732}
1261 1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1740}
1741
1262sub unlink_save { 1742sub unlink_save {
1263 my ($self) = @_; 1743 my ($self) = @_;
1264 1744
1265 utf8::encode (my $save = $self->save_path); 1745 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1746 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1747 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1748}
1269 1749
1270sub load_header_from($) { 1750sub load_header_from($) {
1271 my ($self, $path) = @_; 1751 my ($self, $path) = @_;
1272 1752
1273 utf8::encode $path; 1753 utf8::encode $path;
1274 aio_open $path, O_RDONLY, 0 1754 #aio_open $path, O_RDONLY, 0
1275 or return; 1755 # or return;
1276 1756
1277 $self->_load_header ($path) 1757 $self->_load_header ($path)
1278 or return; 1758 or return;
1279 1759
1280 $self->{load_path} = $path; 1760 $self->{load_path} = $path;
1281 1761
1282 1 1762 1
1283} 1763}
1284 1764
1285sub load_orig { 1765sub load_header_orig {
1286 my ($self) = @_; 1766 my ($self) = @_;
1287 1767
1288 $self->load_header_from ($self->load_path) 1768 $self->load_header_from ($self->load_path)
1289} 1769}
1290 1770
1291sub load_temp { 1771sub load_header_temp {
1292 my ($self) = @_; 1772 my ($self) = @_;
1293 1773
1294 $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;
1295} 1794}
1296 1795
1297sub load_header { 1796sub load_header {
1298 my ($self) = @_; 1797 my ($self) = @_;
1299 1798
1300 if ($self->load_temp) { 1799 if ($self->load_header_temp) {
1301 $self->last_access ((delete $self->{last_access}) 1800 $self->prepare_temp;
1302 || $cf::RUNTIME); #d#
1303 # safety
1304 $self->{instantiate_time} = $cf::RUNTIME
1305 if $self->{instantiate_time} > $cf::RUNTIME;
1306 } else { 1801 } else {
1307 $self->load_orig 1802 $self->load_header_orig
1308 or return; 1803 or return;
1309 1804 $self->prepare_orig;
1310 $self->{load_original} = 1;
1311 $self->{instantiate_time} = $cf::RUNTIME;
1312 $self->last_access ($cf::RUNTIME);
1313 $self->instantiate;
1314 } 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;
1315 1812
1316 1 1813 1
1317} 1814}
1318 1815
1319sub find; 1816sub find;
… …
1332 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1333 1830
1334 $map->load_header 1831 $map->load_header
1335 or return; 1832 or return;
1336 1833
1337 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;
1338 $map->reset; 1837 $map->reset;
1339 undef $guard; 1838 undef $guard;
1340 $map = find $path 1839 return find $path;
1341 or return;
1342 } 1840 }
1343 1841
1344 $cf::MAP{$path} = $map 1842 $cf::MAP{$path} = $map
1345 } 1843 }
1346} 1844}
1845
1846sub pre_load { }
1847sub post_load { }
1347 1848
1348sub load { 1849sub load {
1349 my ($self) = @_; 1850 my ($self) = @_;
1350 1851
1852 local $self->{deny_reset} = 1; # loading can take a long time
1853
1351 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1352 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1353 1859
1354 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1355 1861
1356 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1357 1863
1358 $self->alloc; 1864 $self->alloc;
1865
1866 $self->pre_load;
1867 cf::cede_to_tick;
1868
1359 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1360 or return; 1870 or return;
1361 1871
1362 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1363 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1364 1874
1365 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1366 utf8::encode $uniq; 1876 utf8::encode $uniq;
1367 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1368 $self->clear_unique_items; 1878 $self->clear_unique_items;
1369 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1370 } 1880 }
1371 } 1881 }
1372 1882
1373 Coro::cede; 1883 cf::cede_to_tick;
1374
1375 # now do the right thing for maps 1884 # now do the right thing for maps
1376 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1377
1378 unless ($self->{deny_activate}) {
1379 $self->decay_objects;
1380 $self->fix_auto_apply;
1381 $self->update_buttons;
1382 Coro::cede;
1383 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1887 unless $self->difficulty;
1386 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;
1387 $self->activate; 1897 $self->activate;
1388 } 1898 }
1389 1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1390 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1904 }
1905
1906 $self->post_load;
1391} 1907}
1392 1908
1393sub customise_for { 1909sub customise_for {
1394 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1395 1911
1396 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1397 if $self->per_player; 1913 if $self->per_player;
1398 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1399 $self 1918 $self
1400} 1919}
1401 1920
1402# 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
1403sub load_diag { 1922sub load_neighbours {
1404 my ($map) = @_; 1923 my ($map) = @_;
1405 1924
1406 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1407 1926
1408 for (0 .. 3) { 1927 for (0 .. 3) {
1409 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1410 or next; 1929 or next;
1411 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1412 or next; 1931 or next;
1413 $neigh->load; 1932 $neigh->load;
1414 1933
1934 push @neigh,
1415 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1416 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1417 } 1937 }
1418 1938
1419 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1420 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1421 or next; 1942 or next;
1422 $neigh->load; 1943 $neigh->load;
1423 } 1944 }
1424} 1945}
1425 1946
… …
1430} 1951}
1431 1952
1432sub do_load_sync { 1953sub do_load_sync {
1433 my ($map) = @_; 1954 my ($map) = @_;
1434 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1435 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1436} 1960}
1437 1961
1438our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1963our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1964
1452sub find_async { 1965sub find_async {
1453 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1454 1967
1455 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1456 1969
1457 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1458 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;
1459 } 1987 };
1460
1461 $MAP_PREFETCH{$path} = 0;
1462 $MAP_PREFETCHER->ready; 1988 $MAP_PREFETCHER->prio (6);
1463 1989
1464 () 1990 ()
1465} 1991}
1466 1992
1467sub save { 1993sub save {
1468 my ($self) = @_; 1994 my ($self) = @_;
1469 1995
1470 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1471 1997
1472 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1473 1999
1474 return unless $self->dirty; 2000 return unless $self->dirty;
1475 2001
… …
1498 my ($self) = @_; 2024 my ($self) = @_;
1499 2025
1500 # save first because save cedes 2026 # save first because save cedes
1501 $self->save; 2027 $self->save;
1502 2028
1503 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1504 2030
1505 return if $self->players; 2031 return if $self->players;
1506 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1507 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1508 2034
… …
1512 2038
1513sub reset_at { 2039sub reset_at {
1514 my ($self) = @_; 2040 my ($self) = @_;
1515 2041
1516 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player");
1518 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1519 2044
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 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;
1522 2047
… …
1527 my ($self) = @_; 2052 my ($self) = @_;
1528 2053
1529 $self->reset_at <= $cf::RUNTIME 2054 $self->reset_at <= $cf::RUNTIME
1530} 2055}
1531 2056
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 2057sub reset {
1547 my ($self) = @_; 2058 my ($self) = @_;
1548 2059
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 2061
1551 return if $self->players; 2062 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d#
1553 2063
1554 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 }
1555 2075
1556 delete $cf::MAP{$self->path}; 2076 delete $cf::MAP{$self->path};
2077
2078 $self->clear;
1557 2079
1558 $_->clear_links_to ($self) for values %cf::MAP; 2080 $_->clear_links_to ($self) for values %cf::MAP;
1559 2081
1560 $self->unlink_save; 2082 $self->unlink_save;
1561 $self->destroy; 2083 $self->destroy;
… …
1564my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
1565 2087
1566sub nuke { 2088sub nuke {
1567 my ($self) = @_; 2089 my ($self) = @_;
1568 2090
2091 delete $cf::MAP{$self->path};
2092
2093 $self->unlink_save;
2094
2095 bless $self, "cf::map";
2096 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 2097 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 2098 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100
2101 $cf::MAP{$self->path} = $self;
2102
1572 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
2104}
2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
1573} 2140}
1574 2141
1575=item cf::map::unique_maps 2142=item cf::map::unique_maps
1576 2143
1577Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1578instantiated unique items. May block. 2145instantiated unique items. May block.
1579 2146
1580=cut 2147=cut
1581 2148
1582sub unique_maps() { 2149sub unique_maps() {
1583 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2150 [
1584 or return; 2151 map {
1585
1586 my @paths;
1587
1588 for (@$files) {
1589 utf8::decode $_; 2152 utf8::decode $_;
1590 next if /\.pst$/; 2153 /\.map$/
1591 next unless /^$PATH_SEP/o; 2154 ? normalise $_
1592 2155 : ()
1593 push @paths, $_; 2156 } @{ aio_readdir $UNIQUEDIR or [] }
1594 } 2157 ]
1595
1596 \@paths
1597} 2158}
1598 2159
1599package cf; 2160package cf;
1600 2161
1601=back 2162=back
… …
1647 2208
1648 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1649 2210
1650 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1651 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1652 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220
2221 } else {
1653 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
1654 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2224 }
1655 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
1656} 2236}
1657 2237
1658=item $player_object->may ("access") 2238=item $player_object->may ("access")
1659 2239
1660Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
… …
1692=cut 2272=cut
1693 2273
1694sub link_map { 2274sub link_map {
1695 unless ($LINK_MAP) { 2275 unless ($LINK_MAP) {
1696 $LINK_MAP = cf::map::find "{link}" 2276 $LINK_MAP = cf::map::find "{link}"
1697 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2277 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1698 $LINK_MAP->load; 2278 $LINK_MAP->load;
1699 } 2279 }
1700 2280
1701 $LINK_MAP 2281 $LINK_MAP
1702} 2282}
… …
1707 $self->deactivate_recursive; 2287 $self->deactivate_recursive;
1708 2288
1709 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2289 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 2290
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 2292 if $self->map && $self->map->{path} ne "{link}";
1713 2293
1714 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2294 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 2295}
1716 2296
1717sub cf::object::player::leave_link { 2297sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 2298 my ($self, $map, $x, $y) = @_;
2299
2300 return unless $self->contr->active;
1719 2301
1720 my $link_pos = delete $self->{_link_pos}; 2302 my $link_pos = delete $self->{_link_pos};
1721 2303
1722 unless ($map) { 2304 unless ($map) {
1723 # restore original map position 2305 # restore original map position
… …
1737 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
1738 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
1739 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
1740 2322
1741 $map->load; 2323 $map->load;
1742 $map->load_diag; 2324 $map->load_neighbours;
1743 2325
1744 return unless $self->contr->active; 2326 return unless $self->contr->active;
1745 $self->activate_recursive; 2327 $self->activate_recursive;
2328
2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
1747} 2331}
1748 2332
1749cf::player->attach ( 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1750 on_logout => sub {
1751 my ($pl) = @_;
1752 2334
1753 # abort map switching before logout 2335Moves the player to the given map-path and coordinates by first freezing
1754 if ($pl->ob->{_link_pos}) { 2336her, loading and preparing them map, calling the provided $check callback
1755 cf::sync_job { 2337that has to return the map if sucecssful, and then unfreezes the player on
1756 $pl->ob->leave_link 2338the new (success) or old (failed) map position. In either case, $done will
1757 }; 2339be called at the end of this process.
1758 }
1759 },
1760 on_login => sub {
1761 my ($pl) = @_;
1762 2340
1763 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link;
1767 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1774 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link;
1776 })->prio (2);
1777 }
1778 },
1779);
1780
1781=item $player_object->goto ($path, $x, $y)
1782
1783=cut 2341=cut
2342
2343our $GOTOGEN;
1784 2344
1785sub cf::object::player::goto { 2345sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2347
2348 # do generation counting so two concurrent goto's will be executed in-order
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1787 2350
1788 $self->enter_link; 2351 $self->enter_link;
1789 2352
1790 (async { 2353 (async {
2354 my $map = eval {
1791 my $map = cf::map::find $path; 2355 my $map = cf::map::find $path;
2356
2357 if ($map) {
1792 $map = $map->customise_for ($self) if $map; 2358 $map = $map->customise_for ($self);
1793 2359 $map = $check->($map) if $check && $map;
1794# warn "entering ", $map->path, " at ($x, $y)\n" 2360 } else {
1795# if $map;
1796
1797 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2362 }
1798 2363
2364 $map
2365 };
2366
2367 if ($@) {
2368 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2369 LOG llevError | logBacktrace, Carp::longmess $@;
2370 }
2371
2372 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation};
1799 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2375 }
2376
2377 $done->() if $done;
1800 })->prio (1); 2378 })->prio (1);
1801} 2379}
1802 2380
1803=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
1804 2382
… …
1806 2384
1807sub parse_random_map_params { 2385sub parse_random_map_params {
1808 my ($spec) = @_; 2386 my ($spec) = @_;
1809 2387
1810 my $rmp = { # defaults 2388 my $rmp = { # defaults
1811 xsize => 10, 2389 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 2390 ysize => (cf::rndm 15, 40),
2391 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2392 #layout => string,
1813 }; 2393 };
1814 2394
1815 for (split /\n/, $spec) { 2395 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 2396 my ($k, $v) = split /\s+/, $_, 2;
1817 2397
… …
1821 $rmp 2401 $rmp
1822} 2402}
1823 2403
1824sub prepare_random_map { 2404sub prepare_random_map {
1825 my ($exit) = @_; 2405 my ($exit) = @_;
2406
2407 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 2408
1827 # all this does is basically replace the /! path by 2409 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 2410 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 2411 # that depends on the exit object
1830 2412
1831 my $rmp = parse_random_map_params $exit->msg; 2413 my $rmp = parse_random_map_params $exit->msg;
1832 2414
1833 if ($exit->map) { 2415 if ($exit->map) {
1834 $rmp->{region} = $exit->map->region_name; 2416 $rmp->{region} = $exit->region->name;
1835 $rmp->{origin_map} = $exit->map->path; 2417 $rmp->{origin_map} = $exit->map->path;
1836 $rmp->{origin_x} = $exit->x; 2418 $rmp->{origin_x} = $exit->x;
1837 $rmp->{origin_y} = $exit->y; 2419 $rmp->{origin_y} = $exit->y;
1838 } 2420 }
1839 2421
1840 $rmp->{random_seed} ||= $exit->random_seed; 2422 $rmp->{random_seed} ||= $exit->random_seed;
1841 2423
1842 my $data = cf::to_json $rmp; 2424 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 2425 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta";
1844 2427
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 2429 aio_write $fh, 0, (length $data), $data, 0;
2430 undef $fh;
2431 aio_rename "$meta~", $meta;
1847 2432
1848 $exit->slaying ("?random/$md5"); 2433 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 2434 $exit->msg (undef);
1850 } 2435 }
1851} 2436}
… …
1853sub cf::object::player::enter_exit { 2438sub cf::object::player::enter_exit {
1854 my ($self, $exit) = @_; 2439 my ($self, $exit) = @_;
1855 2440
1856 return unless $self->type == cf::PLAYER; 2441 return unless $self->type == cf::PLAYER;
1857 2442
2443 if ($exit->slaying eq "/!") {
2444 #TODO: this should de-fi-ni-te-ly not be a sync-job
2445 # the problem is that $exit might not survive long enough
2446 # so it needs to be done right now, right here
2447 cf::sync_job { prepare_random_map $exit };
2448 }
2449
2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2451 my $hp = $exit->stats->hp;
2452 my $sp = $exit->stats->sp;
2453
1858 $self->enter_link; 2454 $self->enter_link;
2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
1859 2459
1860 (async { 2460 (async {
1861 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
1862 unless (eval { 2462 unless (eval {
1863 prepare_random_map $exit 2463 $self->goto ($slaying, $hp, $sp);
1864 if $exit->slaying eq "/!";
1865
1866 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1867 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1868 2464
1869 1; 2465 1;
1870 }) { 2466 }) {
1871 $self->message ("Something went wrong deep within the crossfire server. " 2467 $self->message ("Something went wrong deep within the crossfire server. "
1872 . "I'll try to bring you back to the map you were before. " 2468 . "I'll try to bring you back to the map you were before. "
1873 . "Please report this to the dungeon master!", 2469 . "Please report this to the dungeon master!",
1874 cf::NDI_UNIQUE | cf::NDI_RED); 2470 cf::NDI_UNIQUE | cf::NDI_RED);
1875 2471
1876 warn "ERROR in enter_exit: $@"; 2472 warn "ERROR in enter_exit: $@";
1877 $self->leave_link; 2473 $self->leave_link;
1878 } 2474 }
1879 })->prio (1); 2475 })->prio (1);
… …
1892 2488
1893sub cf::client::send_drawinfo { 2489sub cf::client::send_drawinfo {
1894 my ($self, $text, $flags) = @_; 2490 my ($self, $text, $flags) = @_;
1895 2491
1896 utf8::encode $text; 2492 utf8::encode $text;
1897 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1898} 2494}
1899 2495
2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2497
2498Send a drawinfo or msg packet to the client, formatting the msg for the
2499client if neccessary. C<$type> should be a string identifying the type of
2500the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet.
2502
2503=cut
2504
2505sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_;
2507
2508 $msg = $self->pl->expand_cfpod ($msg);
2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2531 } else {
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556}
2557
2558=item $client->ext_msg ($type, @msg)
2559
2560Sends an ext event to the client.
2561
2562=cut
2563
2564sub cf::client::ext_msg($$@) {
2565 my ($self, $type, @msg) = @_;
2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2570 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2591}
1900 2592
1901=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
1902 2594
1903Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
1904the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2596the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1905C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2597C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1906 2598
1907Queries can fail, so check the return code. Or don't, as queries will become 2599Queries can fail, so check the return code. Or don't, as queries will
1908reliable at some point in the future. 2600become reliable at some point in the future.
1909 2601
1910=cut 2602=cut
1911 2603
1912sub cf::client::query { 2604sub cf::client::query {
1913 my ($self, $flags, $text, $cb) = @_; 2605 my ($self, $flags, $text, $cb) = @_;
… …
1921 utf8::encode $text; 2613 utf8::encode $text;
1922 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2614 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1923 2615
1924 $self->send_packet ($self->{query_queue}[0][0]) 2616 $self->send_packet ($self->{query_queue}[0][0])
1925 if @{ $self->{query_queue} } == 1; 2617 if @{ $self->{query_queue} } == 1;
2618
2619 1
1926} 2620}
1927 2621
1928cf::client->attach ( 2622cf::client->attach (
2623 on_connect => sub {
2624 my ($ns) = @_;
2625
2626 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2627 },
1929 on_reply => sub { 2628 on_reply => sub {
1930 my ($ns, $msg) = @_; 2629 my ($ns, $msg) = @_;
1931 2630
1932 # this weird shuffling is so that direct followup queries 2631 # this weird shuffling is so that direct followup queries
1933 # get handled first 2632 # get handled first
1934 my $queue = delete $ns->{query_queue} 2633 my $queue = delete $ns->{query_queue}
1935 or return; # be conservative, not sure how that can happen, but we saw a crash here 2634 or return; # be conservative, not sure how that can happen, but we saw a crash here
1936 2635
1937 (shift @$queue)->[1]->($msg); 2636 (shift @$queue)->[1]->($msg);
2637 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1938 2638
1939 push @{ $ns->{query_queue} }, @$queue; 2639 push @{ $ns->{query_queue} }, @$queue;
1940 2640
1941 if (@{ $ns->{query_queue} } == @$queue) { 2641 if (@{ $ns->{query_queue} } == @$queue) {
1942 if (@$queue) { 2642 if (@$queue) {
… …
1944 } else { 2644 } else {
1945 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2645 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1946 } 2646 }
1947 } 2647 }
1948 }, 2648 },
2649 on_exticmd => sub {
2650 my ($ns, $buf) = @_;
2651
2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2653
2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2662 if (my $cb = $EXTICMD{$type}) {
2663 @reply = $cb->($ns, @payload);
2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2669 } else {
2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2671 }
2672
2673 cf::override;
2674 },
1949); 2675);
1950 2676
1951=item $client->async (\&cb) 2677=item $client->async (\&cb)
1952 2678
1953Create a new coroutine, running the specified callback. The coroutine will 2679Create a new coroutine, running the specified callback. The coroutine will
… …
1994our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
1995our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
1996 2722
1997$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
1998 2724
1999$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2000 2730
2001# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2002 2732
2003=pod 2733=pod
2004 2734
2005The following fucntions and emthods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2006 2736
2007 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2008 cf::object::player player 2741 cf::object::player
2009 cf::player peaceful 2742 player
2010 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2011 2749
2012=cut 2750=cut
2013 2751
2014for ( 2752for (
2015 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2016 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2017 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2018 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2019) { 2759) {
2020 no strict 'refs'; 2760 no strict 'refs';
… …
2091=back 2831=back
2092 2832
2093=cut 2833=cut
2094 2834
2095############################################################################# 2835#############################################################################
2836# the server's init and main functions
2096 2837
2097=head2 EXTENSION DATABASE SUPPORT 2838sub load_facedata($) {
2839 my ($path) = @_;
2098 2840
2099Crossfire maintains a very simple database for extension use. It can 2841 # HACK to clear player env face cache, we need some signal framework
2100currently store anything that can be serialised using Storable, which 2842 # for this (global event?)
2101excludes objects. 2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2102 2844
2103The parameter C<$family> should best start with the name of the extension 2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2104using it, it should be unique.
2105 2846
2106=over 4 2847 warn "loading facedata from $path\n";
2107 2848
2108=item $hashref = cf::db_get $family 2849 my $facedata;
2850 0 < aio_load $path, $facedata
2851 or die "$path: $!";
2109 2852
2110Return a hashref for use by the extension C<$family>, which can be 2853 $facedata = Coro::Storable::thaw $facedata;
2111modified. After modifications, you have to call C<cf::db_dirty> or
2112C<cf::db_sync>.
2113 2854
2114=item $value = cf::db_get $family => $key 2855 $facedata->{version} == 2
2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2115 2857
2116Returns a single value from the database 2858 # patch in the exptable
2117 2859 $facedata->{resource}{"res/exp_table"} = {
2118=item cf::db_put $family => $hashref 2860 type => FT_RSRC,
2119 2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2120Stores the given family hashref into the database. Updates are delayed, if
2121you want the data to be synced to disk immediately, use C<cf::db_sync>.
2122
2123=item cf::db_put $family => $key => $value
2124
2125Stores the given C<$value> in the family hash. Updates are delayed, if you
2126want the data to be synced to disk immediately, use C<cf::db_sync>.
2127
2128=item cf::db_dirty
2129
2130Marks the database as dirty, to be updated at a later time.
2131
2132=item cf::db_sync
2133
2134Immediately write the database to disk I<if it is dirty>.
2135
2136=cut
2137
2138our $DB;
2139
2140{
2141 my $path = cf::localdir . "/database.pst";
2142
2143 sub db_load() {
2144 $DB = stat $path ? Storable::retrieve $path : { };
2145 }
2146
2147 my $pid;
2148
2149 sub db_save() {
2150 waitpid $pid, 0 if $pid;
2151 if (0 == ($pid = fork)) {
2152 $DB->{_meta}{version} = 1;
2153 Storable::nstore $DB, "$path~";
2154 rename "$path~", $path;
2155 cf::_exit 0 if defined $pid;
2156 }
2157 }
2158
2159 my $dirty;
2160
2161 sub db_sync() {
2162 db_save if $dirty;
2163 undef $dirty;
2164 }
2165
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync;
2168 }); 2862 };
2863 cf::cede_to_tick;
2169 2864
2170 sub db_dirty() {
2171 $dirty = 1;
2172 $idle->start;
2173 } 2865 {
2866 my $faces = $facedata->{faceinfo};
2174 2867
2175 sub db_get($;$) { 2868 while (my ($face, $info) = each %$faces) {
2176 @_ >= 2 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2177 ? $DB->{$_[0]}{$_[1]} 2870 cf::face::set_visibility $idx, $info->{visibility};
2178 : ($DB->{$_[0]} ||= { }) 2871 cf::face::set_magicmap $idx, $info->{magicmap};
2179 } 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2180 2874
2181 sub db_put($$;$) { 2875 cf::cede_to_tick;
2182 if (@_ >= 3) {
2183 $DB->{$_[0]}{$_[1]} = $_[2];
2184 } else {
2185 $DB->{$_[0]} = $_[1];
2186 }
2187 db_dirty;
2188 }
2189
2190 cf::global->attach (
2191 prio => 10000,
2192 on_cleanup => sub {
2193 db_sync;
2194 }, 2876 }
2195 );
2196}
2197 2877
2198############################################################################# 2878 while (my ($face, $info) = each %$faces) {
2199# the server's main() 2879 next unless $info->{smooth};
2880 my $idx = cf::face::find $face
2881 or next;
2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2885 } else {
2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 }
2200 2888
2201sub cfg_load { 2889 cf::cede_to_tick;
2890 }
2891 }
2892
2893 {
2894 my $anims = $facedata->{animinfo};
2895
2896 while (my ($anim, $info) = each %$anims) {
2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2898 cf::cede_to_tick;
2899 }
2900
2901 cf::anim::invalidate_all; # d'oh
2902 }
2903
2904 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource};
2908
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914
2915 if ($info->{type} & 1) {
2916 # prepend meta info
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else {
2925 $data = $info->{data};
2926 }
2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick;
2932 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 }
2952
2953 1
2954}
2955
2956register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_;
2958
2959 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v);
2961 }
2962};
2963
2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2969 load_resource_file "$MAPDIR/regions"
2970 or die "unable to load regions file\n";
2971
2972 for (cf::region::list) {
2973 $_->{match} = qr/$_->{match}/
2974 if exists $_->{match};
2975 }
2976}
2977
2978sub reload_facedata {
2979 load_facedata "$DATADIR/facedata"
2980 or die "unable to load facedata\n";
2981}
2982
2983sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991}
2992
2993sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n";
2996}
2997
2998sub reload_resources {
2999 warn "reloading resource files...\n";
3000
3001 reload_regions;
3002 reload_facedata;
3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures;
3006
3007 warn "finished reloading resource files\n";
3008}
3009
3010sub init {
3011 reload_resources;
3012}
3013
3014sub reload_config {
2202 open my $fh, "<:utf8", cf::confdir . "/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2203 or return; 3016 or return;
2204 3017
2205 local $/; 3018 local $/;
2206 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
2207 3020
… …
2221 3034
2222sub main { 3035sub main {
2223 # we must not ever block the main coroutine 3036 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 3037 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3038 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3039 (async {
2226 async { Event::one_event }; 3040 Event::one_event;
3041 })->prio (Coro::PRIO_MAX);
2227 }; 3042 };
2228 3043
2229 cfg_load; 3044 reload_config;
2230 db_load; 3045 db_init;
2231 load_extensions; 3046 load_extensions;
3047
3048 $TICK_WATCHER->start;
2232 Event::loop; 3049 Event::loop;
2233} 3050}
2234 3051
2235############################################################################# 3052#############################################################################
2236# initialisation and cleanup 3053# initialisation and cleanup
2237 3054
2238# install some emergency cleanup handlers 3055# install some emergency cleanup handlers
2239BEGIN { 3056BEGIN {
2240 for my $signal (qw(INT HUP TERM)) { 3057 for my $signal (qw(INT HUP TERM)) {
2241 Event->signal ( 3058 Event->signal (
3059 reentrant => 0,
2242 data => WF_AUTOCANCEL, 3060 data => WF_AUTOCANCEL,
2243 signal => $signal, 3061 signal => $signal,
3062 prio => 0,
2244 cb => sub { 3063 cb => sub {
2245 cf::cleanup "SIG$signal"; 3064 cf::cleanup "SIG$signal";
2246 }, 3065 },
2247 ); 3066 );
2248 } 3067 }
2249} 3068}
2250 3069
3070sub write_runtime {
3071 my $runtime = "$LOCALDIR/runtime";
3072
3073 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time.
3075
3076 IO::AIO::aio_utime $runtime, undef, undef;
3077
3078 my $guard = cf::lock_acquire "write_runtime";
3079
3080 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3081 or return;
3082
3083 my $value = $cf::RUNTIME + 90 + 10;
3084 # 10 is the runtime save interval, for a monotonic clock
3085 # 60 allows for the watchdog to kill the server.
3086
3087 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3088 and return;
3089
3090 # always fsync - this file is important
3091 aio_fsync $fh
3092 and return;
3093
3094 # touch it again to show we are up-to-date
3095 aio_utime $fh, undef, undef;
3096
3097 close $fh
3098 or return;
3099
3100 aio_rename "$runtime~", $runtime
3101 and return;
3102
3103 warn "runtime file written.\n";
3104
3105 1
3106}
3107
2251sub emergency_save() { 3108sub emergency_save() {
2252 my $freeze_guard = cf::freeze_mainloop; 3109 my $freeze_guard = cf::freeze_mainloop;
2253 3110
2254 warn "enter emergency perl save\n"; 3111 warn "enter emergency perl save\n";
2255 3112
2256 cf::sync_job { 3113 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 3114 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 3115 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 3116 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 3117 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 3118 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 3119 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 3120 $pl->valid or next;
2264 $pl->save; 3121 $pl->save;
… …
2270 my $map = $cf::MAP{$path} or next; 3127 my $map = $cf::MAP{$path} or next;
2271 $map->valid or next; 3128 $map->valid or next;
2272 $map->save; 3129 $map->save;
2273 } 3130 }
2274 warn "end emergency map save\n"; 3131 warn "end emergency map save\n";
3132
3133 warn "begin emergency database checkpoint\n";
3134 BDB::db_env_txn_checkpoint $DB_ENV;
3135 warn "end emergency database checkpoint\n";
2275 }; 3136 };
2276 3137
2277 warn "leave emergency perl save\n"; 3138 warn "leave emergency perl save\n";
2278} 3139}
2279 3140
3141sub post_cleanup {
3142 my ($make_core) = @_;
3143
3144 warn Carp::longmess "post_cleanup backtrace"
3145 if $make_core;
3146}
3147
2280sub reload() { 3148sub do_reload_perl() {
2281 # can/must only be called in main 3149 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 3150 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 3151 warn "can only reload from main coroutine";
2284 return; 3152 return;
2285 } 3153 }
2286 3154
2287 warn "reloading..."; 3155 warn "reloading...";
2288 3156
2289 warn "freezing server"; 3157 warn "entering sync_job";
2290 my $guard = freeze_mainloop; 3158
3159 cf::sync_job {
3160 cf::write_runtime; # external watchdog should not bark
2291 cf::emergency_save; 3161 cf::emergency_save;
3162 cf::write_runtime; # external watchdog should not bark
2292 3163
2293 warn "sync database to disk"; 3164 warn "syncing database to disk";
2294 cf::db_sync; 3165 BDB::db_env_txn_checkpoint $DB_ENV;
2295 IO::AIO::flush;
2296 3166
2297 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 3167 # if anything goes wrong in here, we should simply crash as we already saved
2299 3168
2300 warn "cancel all watchers"; 3169 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 3170 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 3171 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 3172 }
2304 3173
3174 warn "flushing outstanding aio requests";
3175 for (;;) {
3176 BDB::flush;
3177 IO::AIO::flush;
3178 Coro::cede;
3179 last unless IO::AIO::nreqs || BDB::nreqs;
3180 warn "iterate...";
3181 }
3182
3183 ++$RELOAD;
3184
2305 warn "cancel all extension coros"; 3185 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 3186 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 3187 %EXT_CORO = ();
2308 3188
2309 warn "remove commands"; 3189 warn "removing commands";
2310 %COMMAND = (); 3190 %COMMAND = ();
2311 3191
2312 warn "remove ext commands"; 3192 warn "removing ext/exti commands";
2313 %EXTCMD = (); 3193 %EXTCMD = ();
3194 %EXTICMD = ();
2314 3195
2315 warn "unload/nuke all extensions"; 3196 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 3197 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 3198 warn "... unloading $pkg";
2318 3199
2319 if (my $cb = $pkg->can ("unload")) { 3200 if (my $cb = $pkg->can ("unload")) {
2320 eval { 3201 eval {
… …
2325 3206
2326 warn "... nuking $pkg"; 3207 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 3208 Symbol::delete_package $pkg;
2328 } 3209 }
2329 3210
2330 warn "unload all perl modules loaded from $LIBDIR"; 3211 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 3212 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3213 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 3214
2334 warn "removing <$k>"; 3215 warn "... unloading $k";
2335 delete $INC{$k}; 3216 delete $INC{$k};
2336 3217
2337 $k =~ s/\.pm$//; 3218 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 3219 $k =~ s/\//::/g;
2339 3220
… …
2342 } 3223 }
2343 3224
2344 Symbol::delete_package $k; 3225 Symbol::delete_package $k;
2345 } 3226 }
2346 3227
2347 warn "get rid of safe::, as good as possible"; 3228 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 3229 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3230 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 3231
2351 warn "unload cf.pm \"a bit\""; 3232 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 3233 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"};
2353 3235
2354 # don't, removes xs symbols, too, 3236 # don't, removes xs symbols, too,
2355 # and global variables created in xs 3237 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 3238 #Symbol::delete_package __PACKAGE__;
2357 3239
3240 warn "unload completed, starting to reload now";
3241
2358 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
2359 require cf; 3243 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 3245
2362 warn "load config and database again"; 3246 warn "loading config and database again";
2363 cf::cfg_load; 3247 cf::reload_config;
2364 cf::db_load;
2365 3248
2366 warn "load extensions"; 3249 warn "loading extensions";
2367 cf::load_extensions; 3250 cf::load_extensions;
2368 3251
2369 warn "reattach attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";
2370 _global_reattach; 3253 _global_reattach; # objects, sockets
2371 warn "reattach attachments to maps"; 3254 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 3255 reattach $_ for values %MAP;
2373 }; 3256 warn "reattaching attachments to players";
3257 reattach $_ for values %PLAYER;
2374 3258
2375 if ($@) { 3259 warn "leaving sync_job";
3260
3261 1
3262 } or do {
2376 warn $@; 3263 warn $@;
2377 warn "error while reloading, exiting."; 3264 warn "error while reloading, exiting.";
2378 exit 1; 3265 exit 1;
2379 } 3266 };
2380 3267
2381 warn "reloaded"; 3268 warn "reloaded";
2382}; 3269};
2383 3270
3271our $RELOAD_WATCHER; # used only during reload
3272
3273sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here.
3276
3277 $RELOAD_WATCHER ||= Event->timer (
3278 reentrant => 0,
3279 after => 0,
3280 data => WF_AUTOCANCEL,
3281 cb => sub {
3282 do_reload_perl;
3283 undef $RELOAD_WATCHER;
3284 },
3285 );
3286}
3287
2384register_command "reload" => sub { 3288register_command "reload" => sub {
2385 my ($who, $arg) = @_; 3289 my ($who, $arg) = @_;
2386 3290
2387 if ($who->flag (FLAG_WIZ)) { 3291 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload.");
2389 reload;
2390 $who->message ("end of reload."); 3292 $who->message ("reloading server.");
3293 async { reload_perl };
2391 } 3294 }
2392}; 3295};
2393 3296
2394unshift @INC, $LIBDIR; 3297unshift @INC, $LIBDIR;
2395 3298
3299my $bug_warning = 0;
3300
3301our @WAIT_FOR_TICK;
3302our @WAIT_FOR_TICK_BEGIN;
3303
3304sub wait_for_tick {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main;
3307
3308 my $signal = new Coro::Signal;
3309 push @WAIT_FOR_TICK, $signal;
3310 $signal->wait;
3311}
3312
3313sub wait_for_tick_begin {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main;
3316
3317 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait;
3320}
3321
3322 my $min = 1e6;#d#
3323 my $avg = 10;
2396$TICK_WATCHER = Event->timer ( 3324$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 3325 reentrant => 0,
3326 parked => 1,
2398 prio => 0, 3327 prio => 0,
2399 at => $NEXT_TICK || $TICK, 3328 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 3329 data => WF_AUTOCANCEL,
2401 cb => sub { 3330 cb => sub {
3331 if ($Coro::current != $Coro::main) {
3332 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3333 unless ++$bug_warning > 10;
3334 return;
3335 }
3336
2402 $NOW = Event::time; 3337 $NOW = $tick_start = Event::time;
2403 3338
2404 cf::server_tick; # one server iteration 3339 cf::server_tick; # one server iteration
3340
3341 0 && sync_job {#d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 };
3363
2405 $RUNTIME += $TICK; 3364 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 3365 $NEXT_TICK += $TICK;
2407 3366
2408 $WAIT_FOR_TICK->broadcast; 3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2409 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool {
3370 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!";
3372 };
3373 }
3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send;
3380 }
3381 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send;
3383 }
3384
3385 $NOW = Event::time;
2410 3386
2411 # if we are delayed by four ticks or more, skip them all 3387 # if we are delayed by four ticks or more, skip them all
2412 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2413 3389
2414 $TICK_WATCHER->at ($NEXT_TICK); 3390 $TICK_WATCHER->at ($NEXT_TICK);
2415 $TICK_WATCHER->start; 3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395
3396 _post_tick;
3397
3398
2416 }, 3399 },
2417); 3400);
2418 3401
3402{
2419IO::AIO::max_poll_time $TICK * 0.2; 3403 BDB::max_poll_time $TICK * 0.1;
2420 3404 $BDB_POLL_WATCHER = Event->io (
2421Event->io ( 3405 reentrant => 0,
2422 fd => IO::AIO::poll_fileno, 3406 fd => BDB::poll_fileno,
2423 poll => 'r', 3407 poll => 'r',
2424 prio => 5, 3408 prio => 0,
2425 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb,
2427);
2428
2429Event->timer (
2430 data => WF_AUTOCANCEL, 3409 data => WF_AUTOCANCEL,
2431 after => 0, 3410 cb => \&BDB::poll_cb,
2432 interval => 10, 3411 );
2433 cb => sub { 3412 BDB::min_parallel 8;
2434 (Coro::unblock_sub { 3413
2435 write_runtime 3414 BDB::set_sync_prepare {
2436 or warn "ERROR: unable to write runtime file: $!"; 3415 my $status;
3416 my $current = $Coro::current;
3417 (
3418 sub {
3419 $status = $!;
3420 $current->ready; undef $current;
3421 },
3422 sub {
3423 Coro::schedule while defined $current;
3424 $! = $status;
3425 },
3426 )
3427 };
3428
3429 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create;
3431
3432 cf::sync_job {
3433 eval {
3434 BDB::db_env_open
3435 $DB_ENV,
3436 $BDBDIR,
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666;
3440
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 };
3446
3447 cf::cleanup "db_env_open(db): $@" if $@;
2437 })->(); 3448 };
2438 }, 3449 }
2439); 3450}
3451
3452{
3453 IO::AIO::min_parallel 8;
3454
3455 undef $Coro::AIO::WATCHER;
3456 IO::AIO::max_poll_time $TICK * 0.1;
3457 $AIO_POLL_WATCHER = Event->io (
3458 reentrant => 0,
3459 data => WF_AUTOCANCEL,
3460 fd => IO::AIO::poll_fileno,
3461 poll => 'r',
3462 prio => 6,
3463 cb => \&IO::AIO::poll_cb,
3464 );
3465}
3466
3467my $_log_backtrace;
3468
3469sub _log_backtrace {
3470 my ($msg, @addr) = @_;
3471
3472 $msg =~ s/\n//;
3473
3474 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace;
3477 async {
3478 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!";
3483
3484 my @funcs;
3485 my @res = <$fh>;
3486 chomp for @res;
3487 while (@res) {
3488 my ($func, $line) = splice @res, 0, 2, ();
3489 push @funcs, "[$func] $line";
3490 }
3491
3492 @funcs
3493 };
3494
3495 LOG llevInfo, "[ABT] $msg\n";
3496 LOG llevInfo, "[ABT] $_\n" for @bt;
3497 --$_log_backtrace;
3498 };
3499 } else {
3500 LOG llevInfo, "[ABT] $msg\n";
3501 LOG llevInfo, "[ABT] [suppressed]\n";
3502 }
3503}
3504
3505# load additional modules
3506use cf::pod;
2440 3507
2441END { cf::emergency_save } 3508END { cf::emergency_save }
2442 3509
24431 35101
2444 3511

Diff Legend

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