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.140 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.159 by root, Wed Jan 10 22:50:12 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
38 42
39our @EVENT; 43our @EVENT;
40our $LIBDIR = datadir . "/ext"; 44our $LIBDIR = datadir . "/ext";
41 45
42our $TICK = MAX_TIME * 1e-6; 46our $TICK = MAX_TIME * 1e-6;
47our %CFG; 51our %CFG;
48 52
49our $UPTIME; $UPTIME ||= time; 53our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 54our $RUNTIME;
51 55
56our %PLAYER; # all users
52our %MAP; # all maps 57our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 58our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 59our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 60
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 63
57binmode STDOUT; 64binmode STDOUT;
58binmode STDERR; 65binmode STDERR;
59 66
60# read virtual server time, if available 67# read virtual server time, if available
105=item %cf::CFG 112=item %cf::CFG
106 113
107Configuration for the server, loaded from C</etc/crossfire/config>, or 114Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 115from wherever your confdir points to.
109 116
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
118
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
121processing has been done. Call C<< ->wait >> on them to maximise the
122window of cpu time available, or simply to synchronise to the server tick.
123
110=back 124=back
111 125
112=cut 126=cut
113 127
114BEGIN { 128BEGIN {
117 utf8::encode $msg; 131 utf8::encode $msg;
118 132
119 $msg .= "\n" 133 $msg .= "\n"
120 unless $msg =~ /\n$/; 134 unless $msg =~ /\n$/;
121 135
122 LOG llevError, "cfperl: $msg"; 136 LOG llevError, $msg;
123 }; 137 };
124} 138}
125 139
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 159
146$Event::DIED = sub { 160$Event::DIED = sub {
147 warn "error in event callback: @_"; 161 warn "error in event callback: @_";
148}; 162};
149 163
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 164=head2 UTILITY FUNCTIONS
155 165
156=over 4 166=over 4
157 167
168=item dumpval $ref
169
158=cut 170=cut
171
172sub dumpval {
173 eval {
174 local $SIG{__DIE__};
175 my $d;
176 if (1) {
177 $d = new Data::Dumper([$_[0]], ["*var"]);
178 $d->Terse(1);
179 $d->Indent(2);
180 $d->Quotekeys(0);
181 $d->Useqq(1);
182 #$d->Bless(...);
183 $d->Seen($_[1]) if @_ > 1;
184 $d = $d->Dump();
185 }
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d
188 } || "[unable to dump $_[0]: '$@']";
189}
159 190
160use JSON::Syck (); # TODO# replace by JSON::PC once working 191use JSON::Syck (); # TODO# replace by JSON::PC once working
161 192
162=item $ref = cf::from_json $json 193=item $ref = cf::from_json $json
163 194
273 warn $@ if $@; 304 warn $@ if $@;
274 undef $busy; 305 undef $busy;
275 })->prio (Coro::PRIO_MAX); 306 })->prio (Coro::PRIO_MAX);
276 307
277 while ($busy) { 308 while ($busy) {
278 unless (Coro::cede) { 309 Coro::cede or Event::one_event;
279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
282 } 310 }
283 311
284 wantarray ? @res : $res[0] 312 wantarray ? @res : $res[0]
285 } else { 313 } else {
286 # we are in another coroutine, how wonderful, everything just works 314 # we are in another coroutine, how wonderful, everything just works
289 } 317 }
290} 318}
291 319
292=item $coro = cf::async_ext { BLOCK } 320=item $coro = cf::async_ext { BLOCK }
293 321
294Like async, but this coro is automcatially being canceled when the 322Like async, but this coro is automatically being canceled when the
295extension calling this is being unloaded. 323extension calling this is being unloaded.
296 324
297=cut 325=cut
298 326
299sub async_ext(&) { 327sub async_ext(&) {
336=cut 364=cut
337 365
338############################################################################# 366#############################################################################
339 367
340package cf::path; 368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
341 375
342sub new { 376sub new {
343 my ($class, $path, $base) = @_; 377 my ($class, $path, $base) = @_;
344 378
345 $path = $path->as_string if ref $path; 379 $path = $path->as_string if ref $path;
351 # ?random/... random maps 385 # ?random/... random maps
352 # /! non-realised random map exit 386 # /! non-realised random map exit
353 # /... normal maps 387 # /... normal maps
354 # ~/... per-player maps without a specific player (DO NOT USE) 388 # ~/... per-player maps without a specific player (DO NOT USE)
355 # ~user/... per-player map of a specific user 389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
356 392
357 if ($path =~ /^{/) { 393 if ($path =~ /^{/) {
358 # fine as it is 394 # fine as it is
359 } elsif ($path =~ s{^\?random/}{}) { 395 } elsif ($path =~ s{^\?random/}{}) {
360 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
409# } 445# }
410} 446}
411 447
412# escape the /'s in the path 448# escape the /'s in the path
413sub _escaped_path { 449sub _escaped_path {
414 # ∕ is U+2215
415 (my $path = $_[0]{path}) =~ s/\///g; 450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
416 $path 451 $path
417} 452}
418 453
419# the original (read-only) location 454# the original (read-only) location
420sub load_path { 455sub load_path {
908=cut 943=cut
909 944
910sub register_extcmd { 945sub register_extcmd {
911 my ($name, $cb) = @_; 946 my ($name, $cb) = @_;
912 947
913 my $caller = caller;
914 #warn "registering extcmd '$name' to '$caller'";
915
916 $EXTCMD{$name} = [$cb, $caller]; 948 $EXTCMD{$name} = $cb;
917} 949}
918 950
919cf::player->attach ( 951cf::player->attach (
920 on_command => sub { 952 on_command => sub {
921 my ($pl, $name, $params) = @_; 953 my ($pl, $name, $params) = @_;
934 966
935 my $msg = eval { from_json $buf }; 967 my $msg = eval { from_json $buf };
936 968
937 if (ref $msg) { 969 if (ref $msg) {
938 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 970 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
939 if (my %reply = $cb->[0]->($pl, $msg)) { 971 if (my %reply = $cb->($pl, $msg)) {
940 $pl->ext_reply ($msg->{msgid}, %reply); 972 $pl->ext_reply ($msg->{msgid}, %reply);
941 } 973 }
942 } 974 }
943 } else { 975 } else {
944 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
946 978
947 cf::override; 979 cf::override;
948 }, 980 },
949); 981);
950 982
951sub register {
952 my ($base, $pkg) = @_;
953
954 #TODO
955}
956
957sub load_extension { 983sub load_extension {
958 my ($path) = @_; 984 my ($path) = @_;
959 985
960 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
961 my $base = $1; 987 my $base = $1;
976 1002
977 eval $source 1003 eval $source
978 or die $@ ? "$path: $@\n" 1004 or die $@ ? "$path: $@\n"
979 : "extension disabled.\n"; 1005 : "extension disabled.\n";
980 1006
981 push @exts, $pkg; 1007 push @EXTS, $pkg;
982 $ext_pkg{$base} = $pkg;
983
984# no strict 'refs';
985# @{"$pkg\::ISA"} = ext::;
986
987 register $base, $pkg;
988}
989
990sub unload_extension {
991 my ($pkg) = @_;
992
993 warn "removing extension $pkg\n";
994
995 # remove hooks
996 #TODO
997# for my $idx (0 .. $#PLUGIN_EVENT) {
998# delete $hook[$idx]{$pkg};
999# }
1000
1001 # remove commands
1002 for my $name (keys %COMMAND) {
1003 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1004
1005 if (@cb) {
1006 $COMMAND{$name} = \@cb;
1007 } else {
1008 delete $COMMAND{$name};
1009 }
1010 }
1011
1012 # remove extcmds
1013 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1014 delete $EXTCMD{$name};
1015 }
1016
1017 if (my $cb = $pkg->can ("unload")) {
1018 eval {
1019 $cb->($pkg);
1020 1
1021 } or warn "$pkg unloaded, but with errors: $@";
1022 }
1023
1024 Symbol::delete_package $pkg;
1025} 1008}
1026 1009
1027sub load_extensions { 1010sub load_extensions {
1028 for my $ext (<$LIBDIR/*.ext>) { 1011 for my $ext (<$LIBDIR/*.ext>) {
1029 next unless -r $ext; 1012 next unless -r $ext;
1047}; 1030};
1048 1031
1049cf::map->attach (prio => -10000, package => cf::mapsupport::); 1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1050 1033
1051############################################################################# 1034#############################################################################
1052# load/save perl data associated with player->ob objects
1053
1054sub all_objects(@) {
1055 @_, map all_objects ($_->inv), @_
1056}
1057
1058# TODO: compatibility cruft, remove when no longer needed
1059cf::player->attach (
1060 on_load => sub {
1061 my ($pl, $path) = @_;
1062
1063 for my $o (all_objects $pl->ob) {
1064 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1065 $o->set_ob_key_value ("_perl_data");
1066
1067 %$o = %{ Storable::thaw pack "H*", $value };
1068 }
1069 }
1070 },
1071);
1072
1073#############################################################################
1074 1035
1075=head2 CORE EXTENSIONS 1036=head2 CORE EXTENSIONS
1076 1037
1077Functions and methods that extend core crossfire objects. 1038Functions and methods that extend core crossfire objects.
1078 1039
1040=cut
1041
1042package cf::player;
1043
1044use Coro::AIO;
1045
1079=head3 cf::player 1046=head3 cf::player
1080 1047
1081=over 4 1048=over 4
1082 1049
1083=item cf::player::exists $login 1050=item cf::player::find $login
1084 1051
1085Returns true when the given account exists. 1052Returns the given player object, loading it if necessary (might block).
1086 1053
1087=cut 1054=cut
1088 1055
1089sub cf::player::exists($) { 1056sub playerdir($) {
1090 cf::player::find $_[0] 1057 cf::localdir
1091 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062}
1063
1064sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066
1067 (playerdir $login) . "/$login.pl"
1068}
1069
1070sub find_active($) {
1071 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active
1073 and $cf::PLAYER{$_[0]}
1074}
1075
1076sub exists($) {
1077 my ($login) = @_;
1078
1079 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login }
1081}
1082
1083sub find($) {
1084 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0];
1086
1087 my $guard = cf::lock_acquire "user_find:$login";
1088
1089 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login
1091 or return;
1092 $cf::PLAYER{$login} = $pl
1093 }
1094 }
1095}
1096
1097sub save($) {
1098 my ($pl) = @_;
1099
1100 return if $pl->{deny_save};
1101
1102 my $path = path $pl;
1103 my $guard = cf::lock_acquire "user_save:$path";
1104
1105 return if $pl->{deny_save};
1106
1107 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME;
1109
1110 $pl->save_pl ($path);
1111 Coro::cede;
1112}
1113
1114sub new($) {
1115 my ($login) = @_;
1116
1117 my $self = create;
1118
1119 $self->ob->name ($login);
1120 $self->{deny_save} = 1;
1121
1122 $cf::PLAYER{$login} = $self;
1123
1124 $self
1125}
1126
1127=item $pl->quit_character
1128
1129Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time.
1131
1132=cut
1133
1134sub quit_character {
1135 my ($pl) = @_;
1136
1137 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1141 $pl->deactivate;
1142 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1143 $pl->ns->destroy if $pl->ns;
1144
1145 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy;
1150 IO::AIO::aio_rmtree $temp;
1151}
1152
1153=item cf::player::list_logins
1154
1155Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever.
1157
1158=cut
1159
1160sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1162 or return [];
1163
1164 my @logins;
1165
1166 for my $login (@$dirs) {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag
1170
1171 utf8::decode $login;
1172 push @logins, $login;
1173 }
1174
1175 \@logins
1176}
1177
1178=item $player->maps
1179
1180Returns an arrayref of cf::path's of all maps that are private for this
1181player. May block.
1182
1183=cut
1184
1185sub maps($) {
1186 my ($pl) = @_;
1187
1188 my $files = aio_readdir playerdir $pl
1189 or return;
1190
1191 my @paths;
1192
1193 for (@$files) {
1194 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o;
1197
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1199 }
1200
1201 \@paths
1092} 1202}
1093 1203
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1204=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1205
1096Sends an ext reply to the player. 1206Sends an ext reply to the player.
1097 1207
1098=cut 1208=cut
1099 1209
1100sub cf::player::ext_reply($$$%) { 1210sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1211 my ($self, $id, %msg) = @_;
1102 1212
1103 $msg{msgid} = $id; 1213 $msg{msgid} = $id;
1104 1214
1105 $self->send ("ext " . to_json \%msg); 1215 $self->send ("ext " . cf::to_json \%msg);
1106} 1216}
1217
1218package cf;
1107 1219
1108=back 1220=back
1109 1221
1110 1222
1111=head3 cf::map 1223=head3 cf::map
1277 Coro::cede; 1389 Coro::cede;
1278 1390
1279 $self->in_memory (cf::MAP_IN_MEMORY); 1391 $self->in_memory (cf::MAP_IN_MEMORY);
1280} 1392}
1281 1393
1394# find and load all maps in the 3x3 area around a map
1395sub load_diag {
1396 my ($map) = @_;
1397
1398 my @diag; # diagonal neighbours
1399
1400 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_)
1402 or next;
1403 $neigh = find $neigh, $map
1404 or next;
1405 $neigh->load;
1406
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 }
1410
1411 for (@diag) {
1412 my $neigh = find @$_
1413 or next;
1414 $neigh->load;
1415 }
1416}
1417
1282sub find_sync { 1418sub find_sync {
1283 my ($path, $origin) = @_; 1419 my ($path, $origin) = @_;
1284 1420
1285 cf::sync_job { cf::map::find $path, $origin } 1421 cf::sync_job { find $path, $origin }
1286} 1422}
1287 1423
1288sub do_load_sync { 1424sub do_load_sync {
1289 my ($map) = @_; 1425 my ($map) = @_;
1290 1426
1291 cf::sync_job { $map->load }; 1427 cf::sync_job { $map->load };
1292} 1428}
1293 1429
1430our %MAP_PREFETCH;
1431our $MAP_PREFETCHER = Coro::async {
1432 while () {
1433 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH
1435 or next;
1436 my $path = delete $MAP_PREFETCH{$key};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 }
1442 Coro::schedule;
1443 }
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready;
1458
1459 ()
1460}
1461
1294sub save { 1462sub save {
1295 my ($self) = @_; 1463 my ($self) = @_;
1296 1464
1297 my $lock = cf::lock_acquire "map_data:" . $self->path; 1465 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298 1466
1306 $self->{load_path} = $save; 1474 $self->{load_path} = $save;
1307 1475
1308 return if $self->{deny_save}; 1476 return if $self->{deny_save};
1309 1477
1310 local $self->{last_access} = $self->last_access;#d# 1478 local $self->{last_access} = $self->last_access;#d#
1479
1480 cf::async {
1481 $_->contr->save for $self->players;
1482 };
1311 1483
1312 if ($uniq) { 1484 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1486 $self->save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1487 } else {
1410 } 1582 }
1411 1583
1412 $map 1584 $map
1413} 1585}
1414 1586
1415sub emergency_save { 1587=item cf::map::unique_maps
1416 my $freeze_guard = cf::freeze_mainloop;
1417 1588
1418 warn "enter emergency map save\n"; 1589Returns an arrayref of cf::path's of all shared maps that have
1590instantiated unique items. May block.
1419 1591
1420 cf::sync_job { 1592=cut
1421 warn "begin emergency map save\n"; 1593
1422 $_->save for values %cf::MAP; 1594sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1596 or return;
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_;
1602 next if /\.pst$/;
1603 next unless /^$PATH_SEP/o;
1604
1605 push @paths, new cf::path $_;
1423 }; 1606 }
1424 1607
1425 warn "end emergency map save\n"; 1608 \@paths
1426} 1609}
1427 1610
1428package cf; 1611package cf;
1429 1612
1430=back 1613=back
1431 1614
1615=head3 cf::object
1616
1617=cut
1618
1619package cf::object;
1620
1621=over 4
1622
1623=item $ob->inv_recursive
1624
1625Returns the inventory of the object _and_ their inventories, recursively.
1626
1627=cut
1628
1629sub inv_recursive_;
1630sub inv_recursive_ {
1631 map { $_, inv_recursive_ $_->inv } @_
1632}
1633
1634sub inv_recursive {
1635 inv_recursive_ inv $_[0]
1636}
1637
1638package cf;
1639
1640=back
1432 1641
1433=head3 cf::object::player 1642=head3 cf::object::player
1434 1643
1435=over 4 1644=over 4
1436 1645
1528 # use -1 or undef as default coordinates, not 0, 0 1737 # use -1 or undef as default coordinates, not 0, 0
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1738 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1739 if $x <=0 && $y <= 0;
1531 1740
1532 $map->load; 1741 $map->load;
1742 $map->load_diag;
1533 1743
1744 return unless $self->contr->active;
1534 $self->activate_recursive; 1745 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1746 $self->enter_map ($map, $x, $y);
1536} 1747}
1537 1748
1538cf::player->attach ( 1749cf::player->attach (
1550 my ($pl) = @_; 1761 my ($pl) = @_;
1551 1762
1552 # try to abort aborted map switching on player login :) 1763 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1764 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1765 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1766 $pl->ob->enter_link;
1557 (async { 1767 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running 1768 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn 1769 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef, 1770 $pl->ob->reply (undef,
1573=cut 1783=cut
1574 1784
1575sub cf::object::player::goto { 1785sub cf::object::player::goto {
1576 my ($self, $path, $x, $y) = @_; 1786 my ($self, $path, $x, $y) = @_;
1577 1787
1788 $path = new cf::path $path;
1789
1578 $self->enter_link; 1790 $self->enter_link;
1579 1791
1580 (async { 1792 (async {
1581 $path = new cf::path $path;
1582
1583 my $map = cf::map::find $path->as_string; 1793 my $map = cf::map::find $path->as_string;
1584 $map = $map->customise_for ($self) if $map; 1794 $map = $map->customise_for ($self) if $map;
1585 1795
1586# warn "entering ", $map->path, " at ($x, $y)\n" 1796# warn "entering ", $map->path, " at ($x, $y)\n"
1587# if $map; 1797# if $map;
1588 1798
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1590 1800
1591 $self->leave_link ($map, $x, $y); 1801 $self->leave_link ($map, $x, $y);
1592 })->prio (1); 1802 })->prio (1);
1593} 1803}
1594 1804
1660 1870
1661 1; 1871 1;
1662 }) { 1872 }) {
1663 $self->message ("Something went wrong deep within the crossfire server. " 1873 $self->message ("Something went wrong deep within the crossfire server. "
1664 . "I'll try to bring you back to the map you were before. " 1874 . "I'll try to bring you back to the map you were before. "
1665 . "Please report this to the dungeon master", 1875 . "Please report this to the dungeon master!",
1666 cf::NDI_UNIQUE | cf::NDI_RED); 1876 cf::NDI_UNIQUE | cf::NDI_RED);
1667 1877
1668 warn "ERROR in enter_exit: $@"; 1878 warn "ERROR in enter_exit: $@";
1669 $self->leave_link; 1879 $self->leave_link;
1670 } 1880 }
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2212 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2213 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004 2214
2005 if (exists $CFG{mlockall}) { 2215 if (exists $CFG{mlockall}) {
2006 eval { 2216 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall 2217 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2008 and die "WARNING: m(un)lockall failed: $!\n"; 2218 and die "WARNING: m(un)lockall failed: $!\n";
2009 }; 2219 };
2010 warn $@ if $@; 2220 warn $@ if $@;
2011 } 2221 }
2012} 2222}
2023 load_extensions; 2233 load_extensions;
2024 Event::loop; 2234 Event::loop;
2025} 2235}
2026 2236
2027############################################################################# 2237#############################################################################
2028# initialisation 2238# initialisation and cleanup
2239
2240# install some emergency cleanup handlers
2241BEGIN {
2242 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal (
2244 data => WF_AUTOCANCEL,
2245 signal => $signal,
2246 cb => sub {
2247 cf::cleanup "SIG$signal";
2248 },
2249 );
2250 }
2251}
2252
2253sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop;
2255
2256 warn "enter emergency perl save\n";
2257
2258 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously.
2262 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next;
2266 $pl->save;
2267 }
2268 warn "end emergency player save\n";
2269
2270 warn "begin emergency map save\n";
2271 for my $path (keys %cf::MAP) {
2272 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next;
2274 $map->save;
2275 }
2276 warn "end emergency map save\n";
2277 };
2278
2279 warn "leave emergency perl save\n";
2280}
2029 2281
2030sub reload() { 2282sub reload() {
2031 # can/must only be called in main 2283 # can/must only be called in main
2032 if ($Coro::current != $Coro::main) { 2284 if ($Coro::current != $Coro::main) {
2033 warn "can only reload from main coroutine\n"; 2285 warn "can only reload from main coroutine\n";
2034 return; 2286 return;
2035 } 2287 }
2036 2288
2037 warn "reloading..."; 2289 warn "reloading...";
2038 2290
2291 warn "freezing server";
2039 my $guard = freeze_mainloop; 2292 my $guard = freeze_mainloop;
2040 cf::emergency_save; 2293 cf::emergency_save;
2041 2294
2295 warn "sync database to disk";
2296 cf::db_sync;
2297 IO::AIO::flush;
2298
2042 eval { 2299 eval {
2043 # if anything goes wrong in here, we should simply crash as we already saved 2300 # if anything goes wrong in here, we should simply crash as we already saved
2044 2301
2045 # cancel all watchers 2302 warn "cancel all watchers";
2046 for (Event::all_watchers) { 2303 for (Event::all_watchers) {
2047 $_->cancel if $_->data & WF_AUTOCANCEL; 2304 $_->cancel if $_->data & WF_AUTOCANCEL;
2048 } 2305 }
2049 2306
2050 # cancel all extension coros 2307 warn "cancel all extension coros";
2051 $_->cancel for values %EXT_CORO; 2308 $_->cancel for values %EXT_CORO;
2052 %EXT_CORO = (); 2309 %EXT_CORO = ();
2053 2310
2311 warn "remove commands";
2312 %COMMAND = ();
2313
2314 warn "remove ext commands";
2315 %EXTCMD = ();
2316
2054 # unload all extensions 2317 warn "unload/nuke all extensions";
2055 for (@exts) { 2318 for my $pkg (@EXTS) {
2056 warn "unloading <$_>"; 2319 warn "unloading <$pkg>";
2057 unload_extension $_; 2320
2321 if (my $cb = $pkg->can ("unload")) {
2322 eval {
2323 $cb->($pkg);
2324 1
2325 } or warn "$pkg unloaded, but with errors: $@";
2058 } 2326 }
2059 2327
2328 Symbol::delete_package $pkg;
2329 }
2330
2060 # unload all modules loaded from $LIBDIR 2331 warn "unload all perl modules loaded from $LIBDIR";
2061 while (my ($k, $v) = each %INC) { 2332 while (my ($k, $v) = each %INC) {
2062 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2333 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2063 2334
2064 warn "removing <$k>"; 2335 warn "removing <$k>";
2065 delete $INC{$k}; 2336 delete $INC{$k};
2072 } 2343 }
2073 2344
2074 Symbol::delete_package $k; 2345 Symbol::delete_package $k;
2075 } 2346 }
2076 2347
2077 # sync database to disk
2078 cf::db_sync;
2079 IO::AIO::flush;
2080
2081 # get rid of safe::, as good as possible 2348 warn "get rid of safe::, as good as possible";
2082 Symbol::delete_package "safe::$_" 2349 Symbol::delete_package "safe::$_"
2083 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2350 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2084 2351
2085 # remove register_script_function callbacks
2086 # TODO
2087
2088 # unload cf.pm "a bit" 2352 warn "unload cf.pm \"a bit\"";
2089 delete $INC{"cf.pm"}; 2353 delete $INC{"cf.pm"};
2090 2354
2091 # don't, removes xs symbols, too, 2355 # don't, removes xs symbols, too,
2092 # and global variables created in xs 2356 # and global variables created in xs
2093 #Symbol::delete_package __PACKAGE__; 2357 #Symbol::delete_package __PACKAGE__;
2094 2358
2095 # reload cf.pm
2096 warn "reloading cf.pm"; 2359 warn "reloading cf.pm";
2097 require cf; 2360 require cf;
2098 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2361 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2099 2362
2100 # load config and database again 2363 warn "load config and database again";
2101 cf::cfg_load; 2364 cf::cfg_load;
2102 cf::db_load; 2365 cf::db_load;
2103 2366
2104 # load extensions
2105 warn "load extensions"; 2367 warn "load extensions";
2106 cf::load_extensions; 2368 cf::load_extensions;
2107 2369
2108 # reattach attachments to objects 2370 warn "reattach attachments to objects/players";
2109 warn "reattach";
2110 _global_reattach; 2371 _global_reattach;
2372 warn "reattach attachments to maps";
2373 reattach $_ for values %MAP;
2111 }; 2374 };
2112 2375
2113 if ($@) { 2376 if ($@) {
2114 warn $@; 2377 warn $@;
2115 warn "error while reloading, exiting."; 2378 warn "error while reloading, exiting.";
2116 exit 1; 2379 exit 1;
2117 } 2380 }
2118 2381
2119 warn "reloaded successfully"; 2382 warn "reloaded";
2120}; 2383};
2121 2384
2122############################################################################# 2385#############################################################################
2123 2386
2124unless ($LINK_MAP) { 2387unless ($LINK_MAP) {
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2394 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2395 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133 2396
2134 # dirty hack because... archetypes are not yet loaded 2397 # dirty hack because... archetypes are not yet loaded
2135 Event->timer ( 2398 Event->timer (
2136 after => 2, 2399 after => 10,
2137 cb => sub { 2400 cb => sub {
2138 $_[0]->w->cancel; 2401 $_[0]->w->cancel;
2139 2402
2140 # provide some exits "home" 2403 # provide some exits "home"
2141 my $exit = cf::object::new "exit"; 2404 my $exit = cf::object::new "exit";
2159 $LINK_MAP->{deny_save} = 1; 2422 $LINK_MAP->{deny_save} = 1;
2160 $LINK_MAP->{deny_reset} = 1; 2423 $LINK_MAP->{deny_reset} = 1;
2161 2424
2162 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2425 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2163} 2426}
2164
2165register "<global>", __PACKAGE__;
2166 2427
2167register_command "reload" => sub { 2428register_command "reload" => sub {
2168 my ($who, $arg) = @_; 2429 my ($who, $arg) = @_;
2169 2430
2170 if ($who->flag (FLAG_WIZ)) { 2431 if ($who->flag (FLAG_WIZ)) {
2183 data => WF_AUTOCANCEL, 2444 data => WF_AUTOCANCEL,
2184 cb => sub { 2445 cb => sub {
2185 cf::server_tick; # one server iteration 2446 cf::server_tick; # one server iteration
2186 $RUNTIME += $TICK; 2447 $RUNTIME += $TICK;
2187 $NEXT_TICK += $TICK; 2448 $NEXT_TICK += $TICK;
2449
2450 $WAIT_FOR_TICK->broadcast;
2451 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2188 2452
2189 # if we are delayed by four ticks or more, skip them all 2453 # if we are delayed by four ticks or more, skip them all
2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2454 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2191 2455
2192 $TICK_WATCHER->at ($NEXT_TICK); 2456 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines