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.116 by root, Mon Jan 1 17:30:34 2007 UTC vs.
Revision 1.153 by root, Mon Jan 8 23:36:16 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
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 Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
817 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
818 or return; 871 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
820 } 873 }
821 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 877 return ($data, $av);
823} 878}
824 879
825############################################################################# 880#############################################################################
826# command handling &c 881# command handling &c
1017 1072
1018=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1019 1074
1020Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1021 1076
1077=cut
1078
1079package cf::player;
1080
1022=head3 cf::player 1081=head3 cf::player
1023 1082
1024=over 4 1083=over 4
1025 1084
1026=item cf::player::exists $login 1085=item cf::player::find $login
1027 1086
1028Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1029 1088
1030=cut 1089=cut
1031 1090
1032sub cf::player::exists($) { 1091sub playerdir($) {
1033 cf::player::find $_[0] 1092 cf::localdir
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$_[0]} || do {
1125 my $pl = load_pl path $login
1126 or return;
1127 $cf::PLAYER{$login} = $pl
1128 }
1129 }
1130}
1131
1132sub save($) {
1133 my ($pl) = @_;
1134
1135 return if $pl->{deny_save};
1136
1137 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path";
1139
1140 return if $pl->{deny_save};
1141
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME;
1144
1145 $pl->save_pl ($path);
1146 Coro::cede;
1147}
1148
1149sub new($) {
1150 my ($login) = @_;
1151
1152 my $self = create;
1153
1154 $self->ob->name ($login);
1155 $self->{deny_save} = 1;
1156
1157 $cf::PLAYER{$login} = $self;
1158
1159 $self
1160}
1161
1162sub quit_character {
1163 my ($pl) = @_;
1164
1165 $pl->{deny_save} = 1;
1166 $pl->password ("*"); # this should lock out the player until we nuked the dir
1167
1168 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1169 $pl->deactivate;
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns;
1172
1173 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp;
1035} 1179}
1036 1180
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1181=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1182
1039Sends an ext reply to the player. 1183Sends an ext reply to the player.
1040 1184
1041=cut 1185=cut
1042 1186
1043sub cf::player::ext_reply($$$%) { 1187sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1188 my ($self, $id, %msg) = @_;
1045 1189
1046 $msg{msgid} = $id; 1190 $msg{msgid} = $id;
1047 1191
1048 $self->send ("ext " . to_json \%msg); 1192 $self->send ("ext " . cf::to_json \%msg);
1049} 1193}
1194
1195package cf;
1050 1196
1051=back 1197=back
1052 1198
1053 1199
1054=head3 cf::map 1200=head3 cf::map
1060package cf::map; 1206package cf::map;
1061 1207
1062use Fcntl; 1208use Fcntl;
1063use Coro::AIO; 1209use Coro::AIO;
1064 1210
1065our $MAX_RESET = 7200; 1211our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1212our $DEFAULT_RESET = 3000;
1067 1213
1068sub generate_random_map { 1214sub generate_random_map {
1069 my ($path, $rmp) = @_; 1215 my ($path, $rmp) = @_;
1070 1216
1071 # mit "rum" bekleckern, nicht 1217 # mit "rum" bekleckern, nicht
1087# and all this just because we cannot iterate over 1233# and all this just because we cannot iterate over
1088# all maps in C++... 1234# all maps in C++...
1089sub change_all_map_light { 1235sub change_all_map_light {
1090 my ($change) = @_; 1236 my ($change) = @_;
1091 1237
1092 $_->change_map_light ($change) for values %cf::MAP; 1238 $_->change_map_light ($change)
1239 for grep $_->outdoor, values %cf::MAP;
1093} 1240}
1094 1241
1095sub try_load_header($) { 1242sub try_load_header($) {
1096 my ($path) = @_; 1243 my ($path) = @_;
1097 1244
1100 or return; 1247 or return;
1101 1248
1102 my $map = cf::map::new 1249 my $map = cf::map::new
1103 or return; 1250 or return;
1104 1251
1252 # for better error messages only, will be overwritten
1253 $map->path ($path);
1254
1105 $map->load_header ($path) 1255 $map->load_header ($path)
1106 or return; 1256 or return;
1107 1257
1108 $map->{load_path} = $path; 1258 $map->{load_path} = $path;
1109 1259
1110 $map 1260 $map
1111} 1261}
1112 1262
1263sub find;
1113sub find_map { 1264sub find {
1114 my ($path, $origin) = @_; 1265 my ($path, $origin) = @_;
1115 1266
1116 #warn "find_map<$path,$origin>\n";#d# 1267 #warn "find<$path,$origin>\n";#d#
1117 1268
1118 $path = new cf::path $path, $origin && $origin->path; 1269 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1270 my $key = $path->as_string;
1120 1271
1272 cf::lock_wait "map_find:$key";
1273
1121 $cf::MAP{$key} || do { 1274 $cf::MAP{$key} || do {
1275 my $guard = cf::lock_acquire "map_find:$key";
1276
1122 # do it the slow way 1277 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1278 my $map = try_load_header $path->save_path;
1124 1279
1280 Coro::cede;
1281
1125 if ($map) { 1282 if ($map) {
1283 $map->last_access ((delete $map->{last_access})
1284 || $cf::RUNTIME); #d#
1126 # safety 1285 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1286 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1287 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1288 } else {
1130 if (my $rmp = $path->random_map_params) { 1289 if (my $rmp = $path->random_map_params) {
1135 1294
1136 $map or return; 1295 $map or return;
1137 1296
1138 $map->{load_original} = 1; 1297 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1298 $map->{instantiate_time} = $cf::RUNTIME;
1299 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1300 $map->instantiate;
1141 1301
1142 # per-player maps become, after loading, normal maps 1302 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1303 $map->per_player (0) if $path->{user_rel};
1144 } 1304 }
1145 1305
1146 $map->path ($key); 1306 $map->path ($key);
1147 $map->{path} = $path; 1307 $map->{path} = $path;
1148 $map->{last_save} = $cf::RUNTIME; 1308 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1309
1310 Coro::cede;
1150 1311
1151 if ($map->should_reset) { 1312 if ($map->should_reset) {
1152 $map->reset; 1313 $map->reset;
1314 undef $guard;
1153 $map = find_map $path; 1315 $map = find $path
1316 or return;
1154 } 1317 }
1155 1318
1156 $cf::MAP{$key} = $map 1319 $cf::MAP{$key} = $map
1157 } 1320 }
1158} 1321}
1159 1322
1160sub load { 1323sub load {
1161 my ($self) = @_; 1324 my ($self) = @_;
1162 1325
1326 my $path = $self->{path};
1327 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1328
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1329 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1330
1165 $self->in_memory (cf::MAP_LOADING); 1331 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1332
1169 $self->alloc; 1333 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1334 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1335 or return;
1172 1336
1178 if (aio_open $uniq, O_RDONLY, 0) { 1342 if (aio_open $uniq, O_RDONLY, 0) {
1179 $self->clear_unique_items; 1343 $self->clear_unique_items;
1180 $self->load_objects ($uniq, 0); 1344 $self->load_objects ($uniq, 0);
1181 } 1345 }
1182 } 1346 }
1347
1348 Coro::cede;
1183 1349
1184 # now do the right thing for maps 1350 # now do the right thing for maps
1185 $self->link_multipart_objects; 1351 $self->link_multipart_objects;
1186 1352
1187 if ($self->{path}->is_style_map) { 1353 if ($self->{path}->is_style_map) {
1195 $self->difficulty ($self->estimate_difficulty) 1361 $self->difficulty ($self->estimate_difficulty)
1196 unless $self->difficulty; 1362 unless $self->difficulty;
1197 $self->activate; 1363 $self->activate;
1198 } 1364 }
1199 1365
1366 Coro::cede;
1367
1200 $self->in_memory (cf::MAP_IN_MEMORY); 1368 $self->in_memory (cf::MAP_IN_MEMORY);
1201} 1369}
1202 1370
1203sub load_map_sync { 1371sub find_sync {
1204 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1205 1373
1206 #warn "load_map_sync<$path, $origin>\n";#d# 1374 cf::sync_job { cf::map::find $path, $origin }
1375}
1207 1376
1208 cf::sync_job { 1377sub do_load_sync {
1209 my $map = cf::map::find_map $path, $origin 1378 my ($map) = @_;
1210 or return; 1379
1211 $map->load; 1380 cf::sync_job { $map->load };
1212 $map
1213 }
1214} 1381}
1215 1382
1216sub save { 1383sub save {
1217 my ($self) = @_; 1384 my ($self) = @_;
1218 1385
1386 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387
1388 $self->{last_save} = $cf::RUNTIME;
1389
1390 return unless $self->dirty;
1391
1219 my $save = $self->{path}->save_path; utf8::encode $save; 1392 my $save = $self->{path}->save_path; utf8::encode $save;
1220 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1393 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1221 1394
1222 $self->{last_save} = $cf::RUNTIME;
1223
1224 return unless $self->dirty;
1225
1226 $self->{load_path} = $save; 1395 $self->{load_path} = $save;
1227 1396
1228 return if $self->{deny_save}; 1397 return if $self->{deny_save};
1398
1399 local $self->{last_access} = $self->last_access;#d#
1400
1401 cf::async {
1402 $_->contr->save for $self->players;
1403 };
1229 1404
1230 if ($uniq) { 1405 if ($uniq) {
1231 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1232 $self->save_objects ($uniq, cf::IO_UNIQUES); 1407 $self->save_objects ($uniq, cf::IO_UNIQUES);
1233 } else { 1408 } else {
1236} 1411}
1237 1412
1238sub swap_out { 1413sub swap_out {
1239 my ($self) = @_; 1414 my ($self) = @_;
1240 1415
1416 # save first because save cedes
1417 $self->save;
1418
1419 my $lock = cf::lock_acquire "map_data:" . $self->path;
1420
1241 return if $self->players; 1421 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1422 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1423 return if $self->{deny_save};
1244 1424
1245 $self->save;
1246 $self->clear; 1425 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1426 $self->in_memory (cf::MAP_SWAPPED);
1248} 1427}
1249 1428
1250sub reset_at { 1429sub reset_at {
1288} 1467}
1289 1468
1290sub reset { 1469sub reset {
1291 my ($self) = @_; 1470 my ($self) = @_;
1292 1471
1472 my $lock = cf::lock_acquire "map_data:" . $self->path;
1473
1293 return if $self->players; 1474 return if $self->players;
1294 return if $self->{path}{user_rel};#d# 1475 return if $self->{path}{user_rel};#d#
1295 1476
1296 warn "resetting map ", $self->path;#d# 1477 warn "resetting map ", $self->path;#d#
1297 1478
1316 1497
1317sub customise_for { 1498sub customise_for {
1318 my ($map, $ob) = @_; 1499 my ($map, $ob) = @_;
1319 1500
1320 if ($map->per_player) { 1501 if ($map->per_player) {
1321 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1502 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322 } 1503 }
1323 1504
1324 $map 1505 $map
1325} 1506}
1326 1507
1327sub emergency_save { 1508sub emergency_save {
1328 local $cf::FREEZE = 1; 1509 my $freeze_guard = cf::freeze_mainloop;
1329 1510
1330 warn "enter emergency map save\n"; 1511 warn "enter emergency perl save\n";
1331 1512
1332 cf::sync_job { 1513 cf::sync_job {
1514 warn "begin emergency player save\n";
1515 $_->save for values %cf::PLAYER;
1516 warn "end emergency player save\n";
1517
1333 warn "begin emergency map save\n"; 1518 warn "begin emergency map save\n";
1334 $_->save for values %cf::MAP; 1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1335 }; 1521 };
1336 1522
1337 warn "end emergency map save\n"; 1523 warn "leave emergency perl save\n";
1338} 1524}
1339 1525
1340package cf; 1526package cf;
1341 1527
1342=back 1528=back
1405=cut 1591=cut
1406 1592
1407sub cf::object::player::enter_link { 1593sub cf::object::player::enter_link {
1408 my ($self) = @_; 1594 my ($self) = @_;
1409 1595
1596 $self->deactivate_recursive;
1597
1410 return if $self->map == $LINK_MAP; 1598 return if $self->map == $LINK_MAP;
1411 1599
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1600 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1601 if $self->map;
1414 1602
1415 $self->enter_map ($LINK_MAP, 20, 20); 1603 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1604}
1418 1605
1419sub cf::object::player::leave_link { 1606sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1607 my ($self, $map, $x, $y) = @_;
1421 1608
1422 my $link_pos = delete $self->{_link_pos}; 1609 my $link_pos = delete $self->{_link_pos};
1423 1610
1424 unless ($map) { 1611 unless ($map) {
1425 # restore original map position 1612 # restore original map position
1426 ($map, $x, $y) = @{ $link_pos || [] }; 1613 ($map, $x, $y) = @{ $link_pos || [] };
1427 $map = cf::map::find_map $map; 1614 $map = cf::map::find $map;
1428 1615
1429 unless ($map) { 1616 unless ($map) {
1430 ($map, $x, $y) = @$EMERGENCY_POSITION; 1617 ($map, $x, $y) = @$EMERGENCY_POSITION;
1431 $map = cf::map::find_map $map 1618 $map = cf::map::find $map
1432 or die "FATAL: cannot load emergency map\n"; 1619 or die "FATAL: cannot load emergency map\n";
1433 } 1620 }
1434 } 1621 }
1435 1622
1436 ($x, $y) = (-1, -1) 1623 ($x, $y) = (-1, -1)
1440 ($x, $y) = ($map->enter_x, $map->enter_y) 1627 ($x, $y) = ($map->enter_x, $map->enter_y)
1441 if $x <=0 && $y <= 0; 1628 if $x <=0 && $y <= 0;
1442 1629
1443 $map->load; 1630 $map->load;
1444 1631
1632 return unless $self->contr->active;
1445 $self->activate_recursive; 1633 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1634 $self->enter_map ($map, $x, $y);
1447} 1635}
1448 1636
1637cf::player->attach (
1638 on_logout => sub {
1639 my ($pl) = @_;
1640
1641 # abort map switching before logout
1642 if ($pl->ob->{_link_pos}) {
1643 cf::sync_job {
1644 $pl->ob->leave_link
1645 };
1646 }
1647 },
1648 on_login => sub {
1649 my ($pl) = @_;
1650
1651 # try to abort aborted map switching on player login :)
1652 # should happen only on crashes
1653 if ($pl->ob->{_link_pos}) {
1654 $pl->ob->enter_link;
1655 (async {
1656 # we need this sleep as the login has a concurrent enter_exit running
1657 # and this sleep increases chances of the player not ending up in scorn
1658 $pl->ob->reply (undef,
1659 "There was an internal problem at your last logout, "
1660 . "the server will try to bring you to your intended destination in a second.",
1661 cf::NDI_RED);
1662 Coro::Timer::sleep 1;
1663 $pl->ob->leave_link;
1664 })->prio (2);
1665 }
1666 },
1667);
1668
1449=item $player_object->goto_map ($map, $x, $y) 1669=item $player_object->goto ($path, $x, $y)
1450 1670
1451=cut 1671=cut
1452 1672
1453sub cf::object::player::goto_map { 1673sub cf::object::player::goto {
1454 my ($self, $path, $x, $y) = @_; 1674 my ($self, $path, $x, $y) = @_;
1455 1675
1676 $path = new cf::path $path;
1677 $path ne "/" or Carp::cluck ("oy");#d#
1678
1456 $self->enter_link; 1679 $self->enter_link;
1457 1680
1458 (Coro::async { 1681 (async {
1459 $path = new cf::path $path;
1460
1461 my $map = cf::map::find_map $path->as_string; 1682 my $map = cf::map::find $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1683 $map = $map->customise_for ($self) if $map;
1463 1684
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1685# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1686# if $map;
1466 1687
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1689
1469 $self->leave_link ($map, $x, $y); 1690 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1691 })->prio (1);
1471} 1692}
1472 1693
1525 1746
1526 return unless $self->type == cf::PLAYER; 1747 return unless $self->type == cf::PLAYER;
1527 1748
1528 $self->enter_link; 1749 $self->enter_link;
1529 1750
1530 (Coro::async { 1751 (async {
1752 $self->deactivate_recursive; # just to be sure
1531 unless (eval { 1753 unless (eval {
1532
1533 prepare_random_map $exit 1754 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1755 if $exit->slaying eq "/!";
1535 1756
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1757 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1758 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1538 1759
1539 1; 1760 1;
1540 }) { 1761 }) {
1541 $self->message ("Something went wrong deep within the crossfire server. " 1762 $self->message ("Something went wrong deep within the crossfire server. "
1542 . "I'll try to bring you back to the map you were before. " 1763 . "I'll try to bring you back to the map you were before. "
1599 on_reply => sub { 1820 on_reply => sub {
1600 my ($ns, $msg) = @_; 1821 my ($ns, $msg) = @_;
1601 1822
1602 # this weird shuffling is so that direct followup queries 1823 # this weird shuffling is so that direct followup queries
1603 # get handled first 1824 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1825 my $queue = delete $ns->{query_queue}
1826 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1827
1606 (shift @$queue)->[1]->($msg); 1828 (shift @$queue)->[1]->($msg);
1607 1829
1608 push @{ $ns->{query_queue} }, @$queue; 1830 push @{ $ns->{query_queue} }, @$queue;
1609 1831
1615 } 1837 }
1616 } 1838 }
1617 }, 1839 },
1618); 1840);
1619 1841
1620=item $client->coro (\&cb) 1842=item $client->async (\&cb)
1621 1843
1622Create a new coroutine, running the specified callback. The coroutine will 1844Create a new coroutine, running the specified callback. The coroutine will
1623be automatically cancelled when the client gets destroyed (e.g. on logout, 1845be automatically cancelled when the client gets destroyed (e.g. on logout,
1624or loss of connection). 1846or loss of connection).
1625 1847
1626=cut 1848=cut
1627 1849
1628sub cf::client::coro { 1850sub cf::client::async {
1629 my ($self, $cb) = @_; 1851 my ($self, $cb) = @_;
1630 1852
1631 my $coro; $coro = async { 1853 my $coro = &Coro::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1854
1638 $coro->on_destroy (sub { 1855 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1856 delete $self->{_coro}{$coro+0};
1640 }); 1857 });
1641 1858
1813 2030
1814{ 2031{
1815 my $path = cf::localdir . "/database.pst"; 2032 my $path = cf::localdir . "/database.pst";
1816 2033
1817 sub db_load() { 2034 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 2035 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 2036 }
1821 2037
1822 my $pid; 2038 my $pid;
1823 2039
1824 sub db_save() { 2040 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 2041 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 2042 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 2043 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 2044 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 2045 rename "$path~", $path;
1878 open my $fh, "<:utf8", cf::confdir . "/config" 2093 open my $fh, "<:utf8", cf::confdir . "/config"
1879 or return; 2094 or return;
1880 2095
1881 local $/; 2096 local $/;
1882 *CFG = YAML::Syck::Load <$fh>; 2097 *CFG = YAML::Syck::Load <$fh>;
2098
2099 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2100
2101 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2102 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2103
2104 if (exists $CFG{mlockall}) {
2105 eval {
2106 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2107 and die "WARNING: m(un)lockall failed: $!\n";
2108 };
2109 warn $@ if $@;
2110 }
1883} 2111}
1884 2112
1885sub main { 2113sub main {
1886 # we must not ever block the main coroutine 2114 # we must not ever block the main coroutine
1887 local $Coro::idle = sub { 2115 local $Coro::idle = sub {
1888 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2116 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1889 (Coro::unblock_sub {
1890 Event::one_event; 2117 async { Event::one_event };
1891 })->();
1892 }; 2118 };
1893 2119
1894 cfg_load; 2120 cfg_load;
1895 db_load; 2121 db_load;
1896 load_extensions; 2122 load_extensions;
1907 return; 2133 return;
1908 } 2134 }
1909 2135
1910 warn "reloading..."; 2136 warn "reloading...";
1911 2137
1912 local $FREEZE = 1; 2138 my $guard = freeze_mainloop;
1913 cf::emergency_save; 2139 cf::emergency_save;
1914 2140
1915 eval { 2141 eval {
1916 # if anything goes wrong in here, we should simply crash as we already saved 2142 # if anything goes wrong in here, we should simply crash as we already saved
1917 2143
1979 cf::load_extensions; 2205 cf::load_extensions;
1980 2206
1981 # reattach attachments to objects 2207 # reattach attachments to objects
1982 warn "reattach"; 2208 warn "reattach";
1983 _global_reattach; 2209 _global_reattach;
2210 reattach $_ for values %MAP;
1984 }; 2211 };
1985 2212
1986 if ($@) { 2213 if ($@) {
1987 warn $@; 2214 warn $@;
1988 warn "error while reloading, exiting."; 2215 warn "error while reloading, exiting.";
2004 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2005 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2006 2233
2007 # dirty hack because... archetypes are not yet loaded 2234 # dirty hack because... archetypes are not yet loaded
2008 Event->timer ( 2235 Event->timer (
2009 after => 2, 2236 after => 10,
2010 cb => sub { 2237 cb => sub {
2011 $_[0]->w->cancel; 2238 $_[0]->w->cancel;
2012 2239
2013 # provide some exits "home" 2240 # provide some exits "home"
2014 my $exit = cf::object::new "exit"; 2241 my $exit = cf::object::new "exit";
2053 reentrant => 0, 2280 reentrant => 0,
2054 prio => 0, 2281 prio => 0,
2055 at => $NEXT_TICK || $TICK, 2282 at => $NEXT_TICK || $TICK,
2056 data => WF_AUTOCANCEL, 2283 data => WF_AUTOCANCEL,
2057 cb => sub { 2284 cb => sub {
2058 unless ($FREEZE) {
2059 cf::server_tick; # one server iteration 2285 cf::server_tick; # one server iteration
2060 $RUNTIME += $TICK; 2286 $RUNTIME += $TICK;
2061 }
2062
2063 $NEXT_TICK += $TICK; 2287 $NEXT_TICK += $TICK;
2064 2288
2065 # if we are delayed by four ticks or more, skip them all 2289 # if we are delayed by four ticks or more, skip them all
2066 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067 2291
2090 or warn "ERROR: unable to write runtime file: $!"; 2314 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2315 })->();
2092 }, 2316 },
2093); 2317);
2094 2318
2319END { cf::emergency_save }
2320
20951 23211
2096 2322

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines